[geeklog-cvs] Geeklog-1.x/public_html/admin auth.inc.php, 1.34, 1.35 block.php, 1.115, 1.116 database.php, 1.44, 1.45 group.php, 1.97, 1.98 mail.php, 1.33, 1.34 moderation.php, 1.113, 1.114 plugins.php, 1.78, 1.79 sectest.php, 1.11, 1.12 story.php, 1.264, 1.265 syndication.php, 1.52, 1.53 topic.php, 1.75, 1.76 trackback.php, 1.47, 1.48 user.php, 1.196, 1.197
Oliver
ospiess at qs1489.pair.com
Sun Nov 25 01:58:57 EST 2007
- Previous message (by thread): [geeklog-cvs] Geeklog-1.x/public_html/admin/install/layout style.css, 1.3, 1.4
- Next message (by thread): [geeklog-cvs] Geeklog-1.x/public_html/admin/install addindex.php, 1.3, 1.4 check.php, 1.8, 1.9 help.php, 1.1, 1.2 index.php, 1.20, 1.21 success.php, 1.16, 1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv9782/admin
Modified Files:
auth.inc.php block.php database.php group.php mail.php
moderation.php plugins.php sectest.php story.php
syndication.php topic.php trackback.php user.php
Log Message:
XHTML optional updates
Index: block.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/block.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** block.php 29 Aug 2007 09:33:54 -0000 1.115
--- block.php 25 Nov 2007 06:58:55 -0000 1.116
***************
*** 164,167 ****
--- 164,168 ----
$block_templates->set_var('permissions_editor', SEC_getPermissionsHTML($A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']));
$block_templates->set_var('permissions_msg', $LANG_ACCESS['permmsg']);
+ $block_templates->set_var('max_url_length', 255); // @@@@ added by dengen 2007/09/08
$block_templates->parse('output','editor');
$retval .= $block_templates->finish($block_templates->get_var('output'));
***************
*** 247,251 ****
if (!empty($bid) && SEC_hasrights('block.delete')) {
$delbutton = '<input type="submit" value="' . $LANG_ADMIN['delete']
! . '" name="mode"%s>';
$jsconfirm = ' onclick="return confirm(\'' . $MESSAGE[76] . '\');"';
$block_templates->set_var ('delete_option',
--- 248,252 ----
if (!empty($bid) && SEC_hasrights('block.delete')) {
$delbutton = '<input type="submit" value="' . $LANG_ADMIN['delete']
! . '" name="mode"%s' . XHTML . '>';
$jsconfirm = ' onclick="return confirm(\'' . $MESSAGE[76] . '\');"';
$block_templates->set_var ('delete_option',
***************
*** 409,413 ****
// 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">');
$retval .= ADMIN_list (
--- 410,414 ----
// 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 (
***************
*** 431,435 ****
// 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="0">');
$retval .= ADMIN_list (
--- 432,436 ----
// 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="0"' . XHTML . '>');
$retval .= ADMIN_list (
Index: syndication.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/syndication.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** syndication.php 29 Aug 2007 09:33:54 -0000 1.52
--- syndication.php 25 Nov 2007 06:58:55 -0000 1.53
***************
*** 169,173 ****
// 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.
! $form_arr = array('bottom' => '<input type="hidden" name="feedenabler" value="true">');
$retval .= ADMIN_list ("syndication", "ADMIN_getListField_syndication", $header_arr, $text_arr,
--- 169,173 ----
// 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.
! $form_arr = array('bottom' => '<input type="hidden" name="feedenabler" value="true"' . XHTML . '>');
$retval .= ADMIN_list ("syndication", "ADMIN_getListField_syndication", $header_arr, $text_arr,
***************
*** 222,225 ****
--- 222,226 ----
$feed_template->set_file ('editor', 'feededitor.thtml');
+ $feed_template->set_var ( 'xhtml', XHTML );
$feed_template->set_var ('site_url', $_CONF['site_url']);
$feed_template->set_var ('site_admin_url', $_CONF['site_admin_url']);
***************
*** 262,266 ****
if ($A['fid'] > 0) {
$delbutton = '<input type="submit" value="' . $LANG_ADMIN['delete']
! . '" name="mode"%s>';
$jsconfirm = ' onclick="return confirm(\'' . $MESSAGE[76] . '\');"';
$feed_template->set_var ('delete_option',
--- 263,267 ----
if ($A['fid'] > 0) {
$delbutton = '<input type="submit" value="' . $LANG_ADMIN['delete']
! . '" name="mode"%s' . XHTML . '>';
$jsconfirm = ' onclick="return confirm(\'' . $MESSAGE[76] . '\');"';
$feed_template->set_var ('delete_option',
***************
*** 391,394 ****
--- 392,396 ----
$feed_template->set_file ('type', 'selecttype.thtml');
+ $feed_template->set_var ( 'xhtml', XHTML );
$feed_template->set_var ('site_url', $_CONF['site_url']);
$feed_template->set_var ('site_admin_url', $_CONF['site_admin_url']);
Index: user.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/user.php,v
retrieving revision 1.196
retrieving revision 1.197
diff -C2 -d -r1.196 -r1.197
*** user.php 25 Nov 2007 05:19:03 -0000 1.196
--- user.php 25 Nov 2007 06:58:55 -0000 1.197
***************
*** 110,121 ****
if ($readonly) {
! $input .= ' disabled="disabled">'
. '<input type="hidden" name="' . $table . '[]" value="'
! . $A[0] . '" checked="checked">';
$retval .= '<span title="' . $LANG_ACCESS['readonly'] . '">'
! . $input . stripslashes ($A[1]) . '</span><br>' . LB;
} else {
$input .= ' name="' . $table . '[]" value="' . $A[0] . '"';
! $retval .= $input . '>' . stripslashes ($A[1]) . '<br>' . LB;
}
}
--- 110,121 ----
if ($readonly) {
! $input .= ' disabled="disabled"' . XHTML . '>'
. '<input type="hidden" name="' . $table . '[]" value="'
! . $A[0] . '" checked="checked"' . XHTML . '>';
$retval .= '<span title="' . $LANG_ACCESS['readonly'] . '">'
! . $input . stripslashes ($A[1]) . '</span><br' . XHTML . '>' . LB;
} else {
$input .= ' name="' . $table . '[]" value="' . $A[0] . '"';
! $retval .= $input . XHTML . '>' . stripslashes ($A[1]) . '<br' . XHTML . '>' . LB;
}
}
***************
*** 190,193 ****
--- 190,194 ----
$user_templates->set_file (array ('form' => 'edituser.thtml',
'groupedit' => 'groupedit.thtml'));
+ $user_templates->set_var( 'xhtml', XHTML );
$user_templates->set_var('site_url', $_CONF['site_url']);
$user_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
***************
*** 196,200 ****
if (!empty($uid) && ($A['uid'] != $_USER['uid']) && SEC_hasRights('user.delete')) {
$delbutton = '<input type="submit" value="' . $LANG_ADMIN['delete']
! . '" name="mode"%s>';
$jsconfirm = ' onclick="return confirm(\'' . $MESSAGE[76] . '\');"';
$user_templates->set_var ('delete_option',
--- 197,201 ----
if (!empty($uid) && ($A['uid'] != $_USER['uid']) && SEC_hasRights('user.delete')) {
$delbutton = '<input type="submit" value="' . $LANG_ADMIN['delete']
! . '" name="mode"%s' . XHTML . '>';
$jsconfirm = ' onclick="return confirm(\'' . $MESSAGE[76] . '\');"';
$user_templates->set_var ('delete_option',
***************
*** 236,240 ****
$user_templates->set_var ('lang_delete_photo', $LANG28[28]);
$user_templates->set_var ('delete_photo_option',
! '<input type="checkbox" name="delete_photo">');
}
} else {
--- 237,241 ----
$user_templates->set_var ('lang_delete_photo', $LANG28[28]);
$user_templates->set_var ('delete_photo_option',
! '<input type="checkbox" name="delete_photo"' . XHTML . '>');
}
} else {
***************
*** 303,307 ****
}
$statusselect .= '</select><input type="hidden" name="oldstatus" value="'
! . $A['status'] . '">';
$user_templates->set_var('user_status', $statusselect);
$user_templates->set_var('lang_user_status', $LANG28[46]);
--- 304,308 ----
}
$statusselect .= '</select><input type="hidden" name="oldstatus" value="'
! . $A['status'] . '"' . XHTML . '>';
$user_templates->set_var('user_status', $statusselect);
$user_templates->set_var('lang_user_status', $LANG28[46]);
***************
*** 345,349 ****
// so we know not to handle the groups array when we save
$user_templates->set_var ('group_edit',
! '<input type="hidden" name="groups" value="-1">');
}
$user_templates->parse('output', 'form');
--- 346,350 ----
// so we know not to handle the groups array when we save
$user_templates->set_var ('group_edit',
! '<input type="hidden" name="groups" value="-1"' . XHTML . '>');
}
$user_templates->parse('output', 'form');
***************
*** 659,663 ****
$display = '';
if (!$_CONF['lastlogin']) {
! $retval = '<br>'. $_LANG28[55];
return $retval;
}
--- 660,664 ----
$display = '';
if (!$_CONF['lastlogin']) {
! $retval = '<br' . XHTML . '>'. $_LANG28[55];
return $retval;
}
***************
*** 699,702 ****
--- 700,705 ----
'options' => 'batchdelete_options.thtml',
'reminder' => 'reminder.thtml'));
+ $user_templates->set_var ( 'xhtml', XHTML );
+ $user_templates->set_var ('site_admin_url', $_CONF['site_admin_url']);
$user_templates->set_var ('site_admin_url', $_CONF['site_admin_url']);
$user_templates->set_var ('usr_type', $usr_type);
***************
*** 822,826 ****
$query_arr, $defsort_arr, '', '', $listoptions,$form_arr);
! // $display .= "<input type=\"hidden\" name=\"mode\" value=\"batchdeleteexec\"></form>" . LB;
return $display;
//
--- 825,829 ----
$query_arr, $defsort_arr, '', '', $listoptions,$form_arr);
! // $display .= "<input type=\"hidden\" name=\"mode\" value=\"batchdeleteexec\"" . XHTML . "></form>" . LB;
return $display;
//
***************
*** 843,847 ****
if (count($user_list) == 0) {
! $msg = $LANG28[72] . "<br>";
}
$c = 0;
--- 846,850 ----
if (count($user_list) == 0) {
! $msg = $LANG28[72] . '<br' . XHTML . '>';
}
$c = 0;
***************
*** 851,855 ****
$delitem = COM_applyFilter($delitem);
if (!USER_deleteAccount ($delitem)) {
! $msg .= "<strong>{$LANG28[2]} $delitem {$LANG28[70]}</strong><br>\n";
} else {
$c++; // count the deleted users
--- 854,858 ----
$delitem = COM_applyFilter($delitem);
if (!USER_deleteAccount ($delitem)) {
! $msg .= "<strong>{$LANG28[2]} $delitem {$LANG28[70]}</strong><br" . XHTML . ">\n";
} else {
$c++; // count the deleted users
***************
*** 861,865 ****
// zero where deleted instead of just leaving this message away.
COM_numberFormat($c); // just in case we have more than 999)..
! $msg .= "{$LANG28[71]}: $c<br>\n";
return $msg;
}
--- 864,868 ----
// zero where deleted instead of just leaving this message away.
COM_numberFormat($c); // just in case we have more than 999)..
! $msg .= "{$LANG28[71]}: $c<br" . XHTML . ">\n";
return $msg;
}
***************
*** 1014,1018 ****
if ($verbose_import) {
! $retval .="<br><b>Working on username=$u_name, fullname=$full_name, and email=$email</b><br>\n";
COM_errorLog ("Working on username=$u_name, fullname=$full_name, and email=$email",1);
}
--- 1017,1021 ----
if ($verbose_import) {
! $retval .="<br" . XHTML . "><b>Working on username=$u_name, fullname=$full_name, and email=$email</b><br" . XHTML . ">\n";
COM_errorLog ("Working on username=$u_name, fullname=$full_name, and email=$email",1);
}
***************
*** 1038,1042 ****
if ($result && $verbose_import) {
! $retval .= "<br> Account for <b>$u_name</b> created successfully.<br>\n";
COM_errorLog("Account for $u_name created successfully",1);
} else if ($result) {
--- 1041,1045 ----
if ($result && $verbose_import) {
! $retval .= "<br" . XHTML . "> Account for <b>$u_name</b> created successfully.<br" . XHTML . ">\n";
COM_errorLog("Account for $u_name created successfully",1);
} else if ($result) {
***************
*** 1044,1053 ****
} else {
// user creation failed
! $retval .= "<br>ERROR: There was a problem creating the account for <b>$u_name</b>.<br>\n";
COM_errorLog("ERROR: here was a problem creating the account for $u_name.",1);
}
} else {
if ($verbose_import) {
! $retval .= "<br><b>$u_name</b> or <b>$email</b> already exists, account not created.<br>\n"; // user already exists
COM_errorLog("$u_name,$email: username or email already exists, account not created",1);
}
--- 1047,1056 ----
} else {
// user creation failed
! $retval .= "<br" . XHTML . ">ERROR: There was a problem creating the account for <b>$u_name</b>.<br" . XHTML . ">\n";
COM_errorLog("ERROR: here was a problem creating the account for $u_name.",1);
}
} else {
if ($verbose_import) {
! $retval .= "<br" . XHTML . "><b>$u_name</b> or <b>$email</b> already exists, account not created.<br" . XHTML . ">\n"; // user already exists
COM_errorLog("$u_name,$email: username or email already exists, account not created",1);
}
***************
*** 1056,1060 ****
} else {
if ($verbose_import) {
! $retval .= "<br><b>$email</b> is not a valid email address, account not created<br>\n"; // malformed email
COM_errorLog("$email is not a valid email address, account not created",1);
}
--- 1059,1063 ----
} else {
if ($verbose_import) {
! $retval .= "<br" . XHTML . "><b>$email</b> is not a valid email address, account not created<br" . XHTML . ">\n"; // malformed email
COM_errorLog("$email is not a valid email address, account not created",1);
}
***************
*** 1085,1092 ****
$retval = '<form action="' . $_CONF['site_admin_url']
. '/user.php" method="post" enctype="multipart/form-data"><div>'
! . $LANG28[29] . ': <input type="file" name="importfile" size="40">'
! . '<input type="hidden" name="mode" value="import">'
. '<input type="submit" name="submit" value="' . $LANG28[30]
! . '"></div></form>';
return $retval;
--- 1088,1095 ----
$retval = '<form action="' . $_CONF['site_admin_url']
. '/user.php" method="post" enctype="multipart/form-data"><div>'
! . $LANG28[29] . ': <input type="file" name="importfile" size="40"' . XHTML . '>'
! . '<input type="hidden" name="mode" value="import"' . XHTML . '>'
. '<input type="submit" name="submit" value="' . $LANG28[30]
! . '"' . XHTML . '></div></form>';
return $retval;
***************
*** 1135,1139 ****
if ($uid > 1) {
$display .= COM_refresh ($_CONF['site_admin_url']
! . '/user.php?mode=edit&msg=67&uid=' . $uid);
} else {
$display .= COM_refresh ($_CONF['site_admin_url'] . '/user.php?msg=67');
--- 1138,1142 ----
if ($uid > 1) {
$display .= COM_refresh ($_CONF['site_admin_url']
! . '/user.php?mode=edit&msg=67&uid=' . $uid);
} else {
$display .= COM_refresh ($_CONF['site_admin_url'] . '/user.php?msg=67');
***************
*** 1188,1192 ****
$display .= COM_startBlock ($LANG28[24], '',
COM_getBlockTemplate ('_admin_block', 'header'));
! $display .= $LANG28[25] . '<br><br>';
$display .= display_form();
$display .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
--- 1191,1195 ----
$display .= COM_startBlock ($LANG28[24], '',
COM_getBlockTemplate ('_admin_block', 'header'));
! $display .= $LANG28[25] . '<br' . XHTML . '><br' . XHTML . '>';
$display .= display_form();
$display .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
Index: mail.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/mail.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** mail.php 9 Jun 2007 20:43:41 -0000 1.33
--- mail.php 25 Nov 2007 06:58:55 -0000 1.34
***************
*** 105,108 ****
--- 105,109 ----
$mail_templates->set_var ('lang_send', $LANG31[12]);
$mail_templates->set_var ('end_block', COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer')));
+ $mail_templates->set_var ( 'xhtml', XHTML );
$mail_templates->parse ('output', 'form');
***************
*** 200,204 ****
$retval .= '<h2>' . $LANG31[21] . '</h2>';
for ($i = 0; $i < count ($failures); $i++) {
! $retval .= current ($failures) . '<br>';
next ($failures);
}
--- 201,205 ----
$retval .= '<h2>' . $LANG31[21] . '</h2>';
for ($i = 0; $i < count ($failures); $i++) {
! $retval .= current ($failures) . '<br' . XHTML . '>';
next ($failures);
}
***************
*** 209,213 ****
$retval .= '<h2>' . $LANG31[22] . '</h2>';
for ($i = 0; $i < count ($successes); $i++) {
! $retval .= current ($successes) . '<br>';
next ($successes);
}
--- 210,214 ----
$retval .= '<h2>' . $LANG31[22] . '</h2>';
for ($i = 0; $i < count ($successes); $i++) {
! $retval .= current ($successes) . '<br' . XHTML . '>';
next ($successes);
}
Index: moderation.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/moderation.php,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** moderation.php 29 Oct 2007 14:10:51 -0000 1.113
--- moderation.php 25 Nov 2007 06:58:55 -0000 1.114
***************
*** 89,92 ****
--- 89,93 ----
'ccrow' => 'ccrow.thtml',
'ccitem' => 'ccitem.thtml'));
+ $admin_templates->set_var( 'xhtml', XHTML );
$retval .= COM_startBlock ('Geeklog ' . VERSION . ' -- ' . $LANG29[34], '',
***************
*** 307,315 ****
$form_arr = array("bottom" => '', "top" => '');
if ($nrows > 0) {
! $form_arr['bottom'] = '<input type="hidden" name="type" value="' . $type . '">' . LB
! . '<input type="hidden" name="mode" value="moderation">' . LB
! . '<input type="hidden" name="count" value="' . $nrows . '">'
. '<p class="aligncenter"><input type="submit" value="'
! . $LANG_ADMIN['submit'] . '"></p>' . LB;
}
--- 308,316 ----
$form_arr = array("bottom" => '', "top" => '');
if ($nrows > 0) {
! $form_arr['bottom'] = '<input type="hidden" name="type" value="' . $type . '"' . XHTML . '>' . LB
! . '<input type="hidden" name="mode" value="moderation"' . XHTML . '>' . LB
! . '<input type="hidden" name="count" value="' . $nrows . '"' . XHTML . '>'
. '<p class="aligncenter"><input type="submit" value="'
! . $LANG_ADMIN['submit'] . '"' . XHTML . '></p>' . LB;
}
***************
*** 369,377 ****
$form_arr = array("bottom" => '', "top" => '');
if ($nrows > 0) {
! $form_arr['bottom'] = '<input type="hidden" name="type" value="user">' . LB
! . '<input type="hidden" name="mode" value="moderation">' . LB
! . '<input type="hidden" name="count" value="' . $nrows . '">'
. '<p align="center"><input type="submit" value="'
! . $LANG_ADMIN['submit'] . '"></p>' . LB;
}
--- 370,378 ----
$form_arr = array("bottom" => '', "top" => '');
if ($nrows > 0) {
! $form_arr['bottom'] = '<input type="hidden" name="type" value="user"' . XHTML . '>' . LB
! . '<input type="hidden" name="mode" value="moderation"' . XHTML . '>' . LB
! . '<input type="hidden" name="count" value="' . $nrows . '"' . XHTML . '>'
. '<p align="center"><input type="submit" value="'
! . $LANG_ADMIN['submit'] . '"' . XHTML . '></p>' . LB;
}
***************
*** 430,438 ****
$form_arr = array("bottom" => '', "top" => '');
if ($nrows > 0) {
! $form_arr['bottom'] = '<input type="hidden" name="type" value="draft">' . LB
! . '<input type="hidden" name="mode" value="moderation">' . LB
! . '<input type="hidden" name="count" value="' . $nrows . '">'
. '<p align="center"><input type="submit" value="'
! . $LANG_ADMIN['submit'] . '"></p>' . LB;
}
--- 431,439 ----
$form_arr = array("bottom" => '', "top" => '');
if ($nrows > 0) {
! $form_arr['bottom'] = '<input type="hidden" name="type" value="draft"' . XHTML . '>' . LB
! . '<input type="hidden" name="mode" value="moderation"' . XHTML . '>' . LB
! . '<input type="hidden" name="count" value="' . $nrows . '"' . XHTML . '>'
. '<p align="center"><input type="submit" value="'
! . $LANG_ADMIN['submit'] . '"' . XHTML . '></p>' . LB;
}
Index: database.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/database.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** database.php 10 Oct 2007 01:07:33 -0000 1.44
--- database.php 25 Nov 2007 06:58:55 -0000 1.45
***************
*** 134,138 ****
$form_arr = array('bottom' => '', 'top' => '');
if ($num_backups > 0) {
! $form_arr['bottom'] = '<input type="hidden" name="mode" value="delete">' . LB;
}
$listoptions = array('chkdelete' => true, 'chkminimum' => 0,
--- 134,138 ----
$form_arr = array('bottom' => '', 'top' => '');
if ($num_backups > 0) {
! $form_arr['bottom'] = '<input type="hidden" name="mode" value="delete"' . XHTML . '>' . LB;
}
$listoptions = array('chkdelete' => true, 'chkminimum' => 0,
Index: story.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/story.php,v
retrieving revision 1.264
retrieving revision 1.265
diff -C2 -d -r1.264 -r1.265
*** story.php 11 Oct 2007 09:48:57 -0000 1.264
--- story.php 25 Nov 2007 06:58:55 -0000 1.265
***************
*** 298,302 ****
$advanced_editormode = true;
$story_templates->set_file(array('editor'=>'storyeditor_advanced.thtml'));
! $story_templates->set_var ('change_editormode', 'onChange="change_editmode(this);"');
require_once ($_CONF['path_system'] . 'classes/navbar.class.php');
--- 298,303 ----
$advanced_editormode = true;
$story_templates->set_file(array('editor'=>'storyeditor_advanced.thtml'));
! $story_templates->set_var ( 'xhtml', XHTML );
! $story_templates->set_var ('change_editormode', 'onchange="change_editmode(this);"');
require_once ($_CONF['path_system'] . 'classes/navbar.class.php');
***************
*** 369,373 ****
if (!empty ($oldsid)) {
$delbutton = '<input type="submit" value="' . $LANG_ADMIN['delete']
! . '" name="mode"%s>';
$jsconfirm = ' onclick="return confirm(\'' . $MESSAGE[76] . '\');"';
$story_templates->set_var ('delete_option',
--- 370,374 ----
if (!empty ($oldsid)) {
$delbutton = '<input type="submit" value="' . $LANG_ADMIN['delete']
! . '" name="mode"%s' . XHTML . '>';
$jsconfirm = ' onclick="return confirm(\'' . $MESSAGE[76] . '\');"';
$story_templates->set_var ('delete_option',
***************
*** 378,382 ****
if ($mode == 'editsubmission') {
$story_templates->set_var ('submission_option',
! '<input type="hidden" name="type" value="submission">');
}
$story_templates->set_var ('lang_author', $LANG24[7]);
--- 379,383 ----
if ($mode == 'editsubmission') {
$story_templates->set_var ('submission_option',
! '<input type="hidden" name="type" value="submission"' . XHTML . '>');
}
$story_templates->set_var ('lang_author', $LANG24[7]);
***************
*** 460,464 ****
if (empty ($ampm_select)) {
// have a hidden field to 24 hour mode to prevent JavaScript errors
! $ampm_select = '<input type="hidden" name="expire_ampm" value="">';
}
$story_templates->set_var ('expireampm_selection', $ampm_select);
--- 461,465 ----
if (empty ($ampm_select)) {
// have a hidden field to 24 hour mode to prevent JavaScript errors
! $ampm_select = '<input type="hidden" name="expire_ampm" value=""' . XHTML . '>';
}
$story_templates->set_var ('expireampm_selection', $ampm_select);
***************
*** 548,552 ****
. "</select>" . LB;
} else {
! $featured_options = "<input type=\"hidden\" name=\"featured\" value=\"0\">";
}
$story_templates->set_var ('featured_options',$featured_options);
--- 549,553 ----
. "</select>" . LB;
} else {
! $featured_options = "<input type=\"hidden\" name=\"featured\" value=\"0\"" . XHTML . ">";
}
$story_templates->set_var ('featured_options',$featured_options);
***************
*** 597,601 ****
. ' ' . $LANG_ADMIN['delete']
. ': <input type="checkbox" name="delete[' .$I['ai_img_num']
! . ']"><br>';
}
}
--- 598,602 ----
. ' ' . $LANG_ADMIN['delete']
. ': <input type="checkbox" name="delete[' .$I['ai_img_num']
! . ']"' . XHTML . '><br' . XHTML . '>';
}
}
***************
*** 603,616 ****
$newallowed = $_CONF['maximagesperarticle'] - $icount;
for ($z = $icount + 1; $z <= $_CONF['maximagesperarticle']; $z++) {
! $fileinputs .= $z . ') <input type="file" name="file' . $z . '">';
if ($z < $_CONF['maximagesperarticle']) {
! $fileinputs .= '<br>';
}
}
! $fileinputs .= '<br>' . $LANG24[51];
if ($_CONF['allow_user_scaling'] == 1) {
$fileinputs .= $LANG24[27];
}
! $fileinputs .= $LANG24[28] . '<br>';
}
$story_templates->set_var('saved_images', $saved_images);
--- 604,617 ----
$newallowed = $_CONF['maximagesperarticle'] - $icount;
for ($z = $icount + 1; $z <= $_CONF['maximagesperarticle']; $z++) {
! $fileinputs .= $z . ') <input type="file" name="file' . $z . '"' . XHTML . '>';
if ($z < $_CONF['maximagesperarticle']) {
! $fileinputs .= '<br' . XHTML . '>';
}
}
! $fileinputs .= '<br' . XHTML . '>' . $LANG24[51];
if ($_CONF['allow_user_scaling'] == 1) {
$fileinputs .= $LANG24[27];
}
! $fileinputs .= $LANG24[28] . '<br' . XHTML . '>';
}
$story_templates->set_var('saved_images', $saved_images);
Index: plugins.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** plugins.php 29 Oct 2007 14:14:48 -0000 1.78
--- plugins.php 25 Nov 2007 06:58:55 -0000 1.79
***************
*** 102,105 ****
--- 102,106 ----
$plg_templates = new Template($_CONF['path_layout'] . 'admin/plugins');
$plg_templates->set_file('editor', 'editor.thtml');
+ $plg_templates->set_var( 'xhtml', XHTML );
$plg_templates->set_var('site_url', $_CONF['site_url']);
$plg_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
***************
*** 113,117 ****
if (!empty($pi_name)) {
$plg_templates->set_var ('delete_option', '<input type="submit" value="'
! . $LANG_ADMIN['delete'] . '" name="mode">');
}
$plugin_code_version = PLG_chkVersion($pi_name);
--- 114,118 ----
if (!empty($pi_name)) {
$plg_templates->set_var ('delete_option', '<input type="submit" value="'
! . $LANG_ADMIN['delete'] . '" name="mode"' . XHTML . '>');
}
$plugin_code_version = PLG_chkVersion($pi_name);
***************
*** 127,131 ****
} else {
$plg_templates->set_var ('update_option', '<input type="submit" value="'
! . $LANG32[34] . '" name="mode">');
}
$plg_templates->set_var('confirmed', $confirmed);
--- 128,132 ----
} else {
$plg_templates->set_var ('update_option', '<input type="submit" value="'
! . $LANG32[34] . '" name="mode"' . XHTML . '>');
}
$plg_templates->set_var('confirmed', $confirmed);
***************
*** 421,425 ****
// 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">');
$retval .= ADMIN_list ('plugins', 'ADMIN_getListField_plugins', $header_arr,
--- 422,426 ----
// 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,
Index: topic.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/topic.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** topic.php 29 Aug 2007 06:55:04 -0000 1.75
--- topic.php 25 Nov 2007 06:58:55 -0000 1.76
***************
*** 110,113 ****
--- 110,114 ----
$topic_templates = new Template($_CONF['path_layout'] . 'admin/topic');
$topic_templates->set_file('editor','topiceditor.thtml');
+ $topic_templates->set_var( 'xhtml', XHTML );
$topic_templates->set_var('site_url', $_CONF['site_url']);
$topic_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
***************
*** 115,119 ****
if (!empty($tid) && SEC_hasRights('topic.edit')) {
$delbutton = '<input type="submit" value="' . $LANG_ADMIN['delete']
! . '" name="mode"%s>';
$jsconfirm = ' onclick="return confirm(\'' . $MESSAGE[76] . '\');"';
$topic_templates->set_var ('delete_option',
--- 116,120 ----
if (!empty($tid) && SEC_hasRights('topic.edit')) {
$delbutton = '<input type="submit" value="' . $LANG_ADMIN['delete']
! . '" name="mode"%s' . XHTML . '>';
$jsconfirm = ' onclick="return confirm(\'' . $MESSAGE[76] . '\');"';
$topic_templates->set_var ('delete_option',
***************
*** 148,152 ****
$A['sortnum'] = '';
}
! $topic_templates->set_var('sort_order', '<input type="text" size="3" maxlength="3" name="sortnum" value="' . $A['sortnum'] . '">');
} else {
$topic_templates->set_var('lang_sortorder', $LANG27[14]);
--- 149,153 ----
$A['sortnum'] = '';
}
! $topic_templates->set_var('sort_order', '<input type="text" size="3" maxlength="3" name="sortnum" value="' . $A['sortnum'] . '"' . XHTML . '>');
} else {
$topic_templates->set_var('lang_sortorder', $LANG27[14]);
***************
*** 319,322 ****
--- 320,324 ----
$topic_templates = new Template($_CONF['path_layout'] . 'admin/topic');
$topic_templates->set_file(array('list'=>'topiclist.thtml', 'item'=>'listitem.thtml'));
+ $topic_templates->set_var( 'xhtml', XHTML );
$topic_templates->set_var('site_url', $_CONF['site_url']);
$topic_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
***************
*** 368,372 ****
$imageurl = COM_getTopicImageUrl ($A['imageurl']);
$topic_templates->set_var ('image_tag', '<img src="' . $imageurl
! . '" alt="">');
}
if ($counter == 5) {
--- 370,374 ----
$imageurl = COM_getTopicImageUrl ($A['imageurl']);
$topic_templates->set_var ('image_tag', '<img src="' . $imageurl
! . '" alt=""' . XHTML . '>');
}
if ($counter == 5) {
***************
*** 376,380 ****
$topic_templates->set_var('begin_row','<tr align="center" valign="bottom">');
} else {
! $topic_templates->set_var('end_row','');
$topic_templates->parse('list_row','item',true);
$topic_templates->set_var('begin_row','');
--- 378,392 ----
$topic_templates->set_var('begin_row','<tr align="center" valign="bottom">');
} else {
!
! // @@@@ changed by dengen 2007/09/05 ---------->>
! // $topic_templates->set_var('end_row','');
! // @@@@ changed by dengen 2007/09/05 ----------||
! if ( $i == $nrows - 1 ) {
! $topic_templates->set_var('end_row','</tr>');
! } else {
! $topic_templates->set_var('end_row','');
! }
! // @@@@ changed by dengen 2007/09/05 ----------<<
!
$topic_templates->parse('list_row','item',true);
$topic_templates->set_var('begin_row','');
***************
*** 383,387 ****
}
}
! $topic_templates->set_var('end_row','</tr>');
$topic_templates->parse('output', 'list');
$retval .= $topic_templates->finish($topic_templates->get_var('output'));
--- 395,401 ----
}
}
! // @@@@ uncommented by dengen 2007/09/05 ---------->>
! // $topic_templates->set_var('end_row','</tr>');
! // @@@@ uncommented by dengen 2007/09/05 ----------<<
$topic_templates->parse('output', 'list');
$retval .= $topic_templates->finish($topic_templates->get_var('output'));
Index: auth.inc.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/auth.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** auth.inc.php 1 Oct 2006 19:16:13 -0000 1.34
--- auth.inc.php 25 Nov 2007 06:58:55 -0000 1.35
***************
*** 91,111 ****
if (!empty($warn)) {
$display .= $LANG20[02]
! .'<br><br>'
.COM_accessLog($LANG20[03] . ' ' . $_POST['loginname']);
}
$display .= '<form action="' . $_SERVER['PHP_SELF']
! . '" method="POST">'
.'<table cellspacing="0" cellpadding="0" border="0" width="100%">'.LB
.'<tr><td align="right">'.$LANG20[04].' </td>'.LB
! .'<td><input type="text" name="loginname" size="16" maxlength="16"></td>'.LB
.'</tr>'.LB
.'<tr>'.LB
.'<td align="right">'.$LANG20[05].' </td>'.LB
! .'<td><input type="password" name="passwd" size="16" maxlength="16"></td>'
.'</tr>'.LB
.'<tr>'.LB
! .'<td colspan="2" align="center" class="warning">'.$LANG20[06].'<input type="hidden" name="warn" value="1">'
! .'<br><input type="submit" name="mode" value="'.$LANG20[07].'"></td>'.LB
.'</tr>'.LB
.'</table></form>'
--- 91,111 ----
if (!empty($warn)) {
$display .= $LANG20[02]
! .'<br' . XHTML . '><br' . XHTML . '>'
.COM_accessLog($LANG20[03] . ' ' . $_POST['loginname']);
}
$display .= '<form action="' . $_SERVER['PHP_SELF']
! . '" method="post">'
.'<table cellspacing="0" cellpadding="0" border="0" width="100%">'.LB
.'<tr><td align="right">'.$LANG20[04].' </td>'.LB
! .'<td><input type="text" name="loginname" size="16" maxlength="16"' . XHTML . '></td>'.LB
.'</tr>'.LB
.'<tr>'.LB
.'<td align="right">'.$LANG20[05].' </td>'.LB
! .'<td><input type="password" name="passwd" size="16" maxlength="16"' . XHTML . '></td>'
.'</tr>'.LB
.'<tr>'.LB
! .'<td colspan="2" align="center" class="warning">'.$LANG20[06].'<input type="hidden" name="warn" value="1"' . XHTML . '>'
! .'<br' . XHTML . '><input type="submit" name="mode" value="'.$LANG20[07].'"' . XHTML . '></td>'.LB
.'</tr>'.LB
.'</table></form>'
Index: sectest.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/sectest.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** sectest.php 23 Sep 2007 18:30:31 -0000 1.11
--- sectest.php 25 Nov 2007 06:58:55 -0000 1.12
***************
*** 129,133 ****
if ($retcode == 200) {
! $retval = 'Your <strong>' . $msg . '</strong> is reachable from the web.<br><em>This is a security risk and should be fixed!</em>';
$failed_tests++;
} elseif (($retcode == 401) || ($retcode == 403) || ($retcode == 404)) {
--- 129,133 ----
if ($retcode == 200) {
! $retval = 'Your <strong>' . $msg . '</strong> is reachable from the web.<br' . XHTML . '><em>This is a security risk and should be fixed!</em>';
$failed_tests++;
} elseif (($retcode == 401) || ($retcode == 403) || ($retcode == 404)) {
Index: group.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/group.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** group.php 31 Aug 2007 04:14:34 -0000 1.97
--- group.php 25 Nov 2007 06:58:55 -0000 1.98
***************
*** 114,117 ****
--- 114,118 ----
$group_templates->set_var('lang_admingroup',$LANG28[49]);
$group_templates->set_var('lang_admingrp_msg', $LANG28[50]);
+ $group_templates->set_var( 'xhtml', XHTML );
$showall = 0;
if (isset ($_GET['chk_showall'])) {
***************
*** 138,142 ****
if ($A['grp_gl_core'] != 1) {
$delbutton = '<input type="submit" value="' . $LANG_ADMIN['delete']
! . '" name="mode"%s>';
$jsconfirm = ' onclick="return confirm(\'' . $MESSAGE[76] . '\');"';
$group_templates->set_var ('delete_option',
--- 139,143 ----
if ($A['grp_gl_core'] != 1) {
$delbutton = '<input type="submit" value="' . $LANG_ADMIN['delete']
! . '" name="mode"%s' . XHTML . '>';
$jsconfirm = ' onclick="return confirm(\'' . $MESSAGE[76] . '\');"';
$group_templates->set_var ('delete_option',
***************
*** 209,213 ****
for ($i = 1; $i <= $nrows; $i++) {
$GRPS = DB_fetchArray($result);
! $groupoptions .= $GRPS['grp_name'] . '<input type="hidden" name="groups[]" value="' . $GRPS['grp_id'] . '"><br>' .LB;
}
$group_templates->set_var('group_options', $groupoptions);
--- 210,214 ----
for ($i = 1; $i <= $nrows; $i++) {
$GRPS = DB_fetchArray($result);
! $groupoptions .= $GRPS['grp_name'] . '<input type="hidden" name="groups[]" value="' . $GRPS['grp_id'] . '"' . XHTML . '><br' . XHTML . '>' .LB;
}
$group_templates->set_var('group_options', $groupoptions);
***************
*** 385,389 ****
}
}
! $retval .= '><span title="' . $A['ft_descr'] . '">' . $A['ft_name']
. '</span></td>';
} else {
--- 386,390 ----
}
}
! $retval .= XHTML . '><span title="' . $A['ft_descr'] . '">' . $A['ft_name']
. '</span></td>';
} else {
***************
*** 762,766 ****
if ($show_all_groups) {
! $filter .= '<label for="chk_showall"><input id="chk_showall" type="checkbox" name="chk_showall" value="1" checked="checked">';
$query_arr = array(
'table' => 'groups',
--- 763,767 ----
if ($show_all_groups) {
! $filter .= '<label for="chk_showall"><input id="chk_showall" type="checkbox" name="chk_showall" value="1" checked="checked"' . XHTML . '>';
$query_arr = array(
'table' => 'groups',
***************
*** 769,773 ****
'default_filter' => $grpFilter);
} else {
! $filter .= "<label for=\"chk_showall\"><input id=\"chk_showall\" type=\"checkbox\" name=\"chk_showall\" value=\"1\"$checked>";
$query_arr = array(
'table' => 'groups',
--- 770,774 ----
'default_filter' => $grpFilter);
} else {
! $filter .= "<label for=\"chk_showall\"><input id=\"chk_showall\" type=\"checkbox\" name=\"chk_showall\" value=\"1\"$checked" . XHTML . ">";
$query_arr = array(
'table' => 'groups',
***************
*** 880,883 ****
--- 881,885 ----
$groupmembers->set_var('show_all', COM_applyFilter($_GET['chk_showall'],true));
$groupmembers->set_var ('group_id',$group);
+ $groupmembers->set_var ( 'xhtml', XHTML );
$groupmembers->parse ('output', 'groupmembers');
$retval .= $groupmembers->finish($groupmembers->get_var('output'));
Index: trackback.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/trackback.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** trackback.php 29 Aug 2007 09:33:54 -0000 1.47
--- trackback.php 25 Nov 2007 06:58:55 -0000 1.48
***************
*** 97,100 ****
--- 97,101 ----
$preview->set_file (array ('comment' => 'trackbackcomment.thtml'));
$comment = TRB_formatComment ($url, $p_title, $p_blog, $p_excerpt);
+ $preview->set_var ( 'xhtml', XHTML );
$preview->set_var ('formatted_comment', $comment);
$preview->parse ('output', 'comment');
***************
*** 117,120 ****
--- 118,122 ----
$template->set_file (array ('editor' => 'trackbackeditor.thtml'));
+ $template->set_var ( 'xhtml', XHTML );
$template->set_var ('site_url', $_CONF['site_url']);
$template->set_var ('site_admin_url', $_CONF['site_admin_url']);
***************
*** 183,187 ****
$url .= '?msg=' . $msg;
} else {
! $url .= '&msg=' . $msg;
}
--- 185,189 ----
$url .= '?msg=' . $msg;
} else {
! $url .= '&msg=' . $msg;
}
***************
*** 240,243 ****
--- 242,246 ----
$template->set_file (array ('list' => 'pingbacklist.thtml',
'item' => 'pingbackitem.thtml'));
+ $template->set_var ( 'xhtml', XHTML );
$template->set_var ('site_url', $_CONF['site_url']);
$template->set_var ('site_admin_url', $_CONF['site_admin_url']);
***************
*** 290,293 ****
--- 293,297 ----
$template = new Template ($_CONF['path_layout'] . 'admin/trackback');
$template->set_file (array ('list' => 'pingbackform.thtml'));
+ $template->set_var ( 'xhtml', XHTML );
$template->set_var ('site_url', $_CONF['site_url']);
$template->set_var ('site_admin_url', $_CONF['site_admin_url']);
***************
*** 328,331 ****
--- 332,336 ----
$template->set_file (array ('list' => 'pinglist.thtml',
'item' => 'pingitem.thtml'));
+ $template->set_var ( 'xhtml', XHTML );
$template->set_var ('site_url', $_CONF['site_url']);
$template->set_var ('site_admin_url', $_CONF['site_admin_url']);
***************
*** 393,397 ****
$baseurl = $_CONF['site_admin_url']
! . '/trackback.php?mode=autodetect&id=' . $id;
if ($type != 'article') {
$baseurl .= '&type' . $type;
--- 398,402 ----
$baseurl = $_CONF['site_admin_url']
! . '/trackback.php?mode=autodetect&id=' . $id;
if ($type != 'article') {
$baseurl .= '&type' . $type;
***************
*** 405,409 ****
// skip the link selection when there's only one link in the story
$url = urlencode ($matches[1][0]);
! $link = $baseurl .= '&url=' . $url;
echo COM_refresh ($link);
--- 410,414 ----
// skip the link selection when there's only one link in the story
$url = urlencode ($matches[1][0]);
! $link = $baseurl .= '&url=' . $url;
echo COM_refresh ($link);
***************
*** 413,423 ****
$template->set_file (array ('list' => 'autodetectlist.thtml',
'item' => 'autodetectitem.thtml'));
$template->set_var ('site_url', $_CONF['site_url']);
$template->set_var ('site_admin_url', $_CONF['site_admin_url']);
$template->set_var ('layout_url', $_CONF['layout_url']);
! $url = $_CONF['site_admin_url'] . '/trackback.php?mode=new&id=' . $id;
if ($type != 'article') {
! $url .= '&type=' . $type;
}
$template->set_var ('lang_trackback_explain',
--- 418,429 ----
$template->set_file (array ('list' => 'autodetectlist.thtml',
'item' => 'autodetectitem.thtml'));
+ $template->set_var ( 'xhtml', XHTML );
$template->set_var ('site_url', $_CONF['site_url']);
$template->set_var ('site_admin_url', $_CONF['site_admin_url']);
$template->set_var ('layout_url', $_CONF['layout_url']);
! $url = $_CONF['site_admin_url'] . '/trackback.php?mode=new&id=' . $id;
if ($type != 'article') {
! $url .= '&type=' . $type;
}
$template->set_var ('lang_trackback_explain',
***************
*** 426,430 ****
for ($i = 0; $i < $numlinks; $i++) {
$url = urlencode ($matches[1][$i]);
! $link = $baseurl .= '&url=' . $url;
$template->set_var ('autodetect_link', $link);
--- 432,436 ----
for ($i = 0; $i < $numlinks; $i++) {
$url = urlencode ($matches[1][$i]);
! $link = $baseurl .= '&url=' . $url;
$template->set_var ('autodetect_link', $link);
***************
*** 513,517 ****
// 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">');
$retval .= ADMIN_list ("pingservice", "ADMIN_getListField_trackback", $header_arr, $text_arr,
--- 519,523 ----
// 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 . '>');
$retval .= ADMIN_list ("pingservice", "ADMIN_getListField_trackback", $header_arr, $text_arr,
***************
*** 582,585 ****
--- 588,592 ----
$template = new Template ($_CONF['path_layout'] . 'admin/trackback');
$template->set_file (array ('editor' => 'serviceeditor.thtml'));
+ $template->set_var ( 'xhtml', XHTML );
$template->set_var ('site_url', $_CONF['site_url']);
$template->set_var ('site_admin_url', $_CONF['site_admin_url']);
***************
*** 601,605 ****
if ($pid > 0) {
$delbutton = '<input type="submit" value="' . $LANG_ADMIN['delete']
! . '" name="servicemode[2]"%s>';
$jsconfirm = ' onclick="return confirm(\'' . $MESSAGE[76] . '\');"';
$template->set_var ('delete_option',
--- 608,612 ----
if ($pid > 0) {
$delbutton = '<input type="submit" value="' . $LANG_ADMIN['delete']
! . '" name="servicemode[2]"%s' . XHTML . '>';
$jsconfirm = ' onclick="return confirm(\'' . $MESSAGE[76] . '\');"';
$template->set_var ('delete_option',
***************
*** 716,720 ****
return COM_refresh ($_CONF['site_admin_url']
! . '/trackback.php?mode=listservice&msg=65');
}
--- 723,727 ----
return COM_refresh ($_CONF['site_admin_url']
! . '/trackback.php?mode=listservice&msg=65');
}
***************
*** 891,895 ****
$display .= trackback_editor ();
} else {
! $message = '<p>' . $LANG_TRB['send_error_details'] . '<br>'
. '<span class="warningsmall">'
. htmlspecialchars ($result) . '</span></p>';
--- 898,902 ----
$display .= trackback_editor ();
} else {
! $message = '<p>' . $LANG_TRB['send_error_details'] . '<br' . XHTML . '>'
. '<span class="warningsmall">'
. htmlspecialchars ($result) . '</span></p>';
***************
*** 963,969 ****
} else if (isset ($what[2])) { // Trackback
$url = $_CONF['site_admin_url']
! . '/trackback.php?mode=pretrackback&id=' . $id;
if ($type != 'article') {
! $url .= '&type=' . $type;
}
echo COM_refresh ($url);
--- 970,976 ----
} else if (isset ($what[2])) { // Trackback
$url = $_CONF['site_admin_url']
! . '/trackback.php?mode=pretrackback&id=' . $id;
if ($type != 'article') {
! $url .= '&type=' . $type;
}
echo COM_refresh ($url);
***************
*** 979,982 ****
--- 986,990 ----
$template = new Template ($_CONF['path_layout'] . 'admin/trackback');
$template->set_file (array ('form' => 'pingform.thtml'));
+ $template->set_var ( 'xhtml', XHTML );
$template->set_var ('site_url', $_CONF['site_url']);
$template->set_var ('site_admin_url', $_CONF['site_admin_url']);
***************
*** 996,1000 ****
$LANG_TRB['pingback_short']);
$button = '<input type="submit" name="what[0]" value="'
! . $LANG_TRB['pingback_button'] . '">';
$template->set_var ('pingback_button', $button);
}
--- 1004,1008 ----
$LANG_TRB['pingback_short']);
$button = '<input type="submit" name="what[0]" value="'
! . $LANG_TRB['pingback_button'] . '"' . XHTML . '>';
$template->set_var ('pingback_button', $button);
}
***************
*** 1007,1011 ****
$template->set_var ('lang_ping_short', $LANG_TRB['ping_short']);
$button = '<input type="submit" name="what[1]" value="'
! . $LANG_TRB['ping_button'] . '">';
$template->set_var ('ping_button', $button);
}
--- 1015,1019 ----
$template->set_var ('lang_ping_short', $LANG_TRB['ping_short']);
$button = '<input type="submit" name="what[1]" value="'
! . $LANG_TRB['ping_button'] . '"' . XHTML . '>';
$template->set_var ('ping_button', $button);
}
***************
*** 1020,1024 ****
$LANG_TRB['trackback_short']);
$button = '<input type="submit" name="what[2]" value="'
! . $LANG_TRB['trackback_button'] . '">';
$template->set_var ('trackback_button', $button);
}
--- 1028,1032 ----
$LANG_TRB['trackback_short']);
$button = '<input type="submit" name="what[2]" value="'
! . $LANG_TRB['trackback_button'] . '"' . XHTML . '>';
$template->set_var ('trackback_button', $button);
}
***************
*** 1029,1043 ****
$hidden = '';
if ($pingback_sent) {
! $hidden .= '<input type="hidden" name="pingback_sent" value="1">';
}
if ($ping_sent) {
! $hidden .= '<input type="hidden" name="ping_sent" value="1">';
}
if ($trackback_sent) {
! $hidden .= '<input type="hidden" name="trackback_sent" value="1">';
}
! $hidden .= '<input type="hidden" name="id" value="' . $id . '">';
! $hidden .= '<input type="hidden" name="type" value="' . $type . '">';
! $hidden .= '<input type="hidden" name="mode" value="sendall">';
$template->set_var ('hidden_input_fields', $hidden);
--- 1037,1051 ----
$hidden = '';
if ($pingback_sent) {
! $hidden .= '<input type="hidden" name="pingback_sent" value="1"' . XHTML . '>';
}
if ($ping_sent) {
! $hidden .= '<input type="hidden" name="ping_sent" value="1"' . XHTML . '>';
}
if ($trackback_sent) {
! $hidden .= '<input type="hidden" name="trackback_sent" value="1"' . XHTML . '>';
}
! $hidden .= '<input type="hidden" name="id" value="' . $id . '"' . XHTML . '>';
! $hidden .= '<input type="hidden" name="type" value="' . $type . '"' . XHTML . '>';
! $hidden .= '<input type="hidden" name="mode" value="sendall"' . XHTML . '>';
$template->set_var ('hidden_input_fields', $hidden);
***************
*** 1166,1170 ****
DB_delete ($_TABLES['pingservice'], 'pid', $pid);
$display = COM_refresh ($_CONF['site_admin_url']
! . '/trackback.php?mode=listservice&msg=66');
} else {
$display = COM_refresh ($_CONF['site_admin_url'] . '/index.php');
--- 1174,1178 ----
DB_delete ($_TABLES['pingservice'], 'pid', $pid);
$display = COM_refresh ($_CONF['site_admin_url']
! . '/trackback.php?mode=listservice&msg=66');
} else {
$display = COM_refresh ($_CONF['site_admin_url'] . '/index.php');
***************
*** 1207,1211 ****
$target = '';
} else {
! $message = '<p>' . $LANG_TRB['pb_error_details'] . '<br>'
. '<span class="warningsmall">'
. htmlspecialchars ($result) . '</span></p>';
--- 1215,1219 ----
$target = '';
} else {
! $message = '<p>' . $LANG_TRB['pb_error_details'] . '<br' . XHTML . '>'
. '<span class="warningsmall">'
. htmlspecialchars ($result) . '</span></p>';
- Previous message (by thread): [geeklog-cvs] Geeklog-1.x/public_html/admin/install/layout style.css, 1.3, 1.4
- Next message (by thread): [geeklog-cvs] Geeklog-1.x/public_html/admin/install addindex.php, 1.3, 1.4 check.php, 1.8, 1.9 help.php, 1.1, 1.2 index.php, 1.20, 1.21 success.php, 1.16, 1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the geeklog-cvs
mailing list