[geeklog-cvs] Geeklog-1.x/public_html article.php, 1.93, 1.94 directory.php, 1.17, 1.18 getimage.php, 1.7, 1.8 index.php, 1.95, 1.96 lib-common.php, 1.663, 1.664 pdfgenerator.php, 1.11, 1.12 profiles.php, 1.52, 1.53 siteconfig.php, 1.4, 1.5 stats.php, 1.51, 1.52 submit.php, 1.118, 1.119 users.php, 1.158, 1.159 usersettings.php, 1.164, 1.165
Oliver
ospiess at qs1489.pair.com
Sun Nov 25 01:55:09 EST 2007
- Previous message (by thread): [geeklog-cvs] Geeklog-1.x/sql mssql_tableanddata.php, 1.30, 1.31 mysql_tableanddata.php, 1.193, 1.194
- Next message (by thread): [geeklog-cvs] Geeklog-1.x/system lib-admin.php, 1.123, 1.124 lib-comment.php, 1.59, 1.60 lib-custom.php, 1.37, 1.38 lib-custom.php.dist, 1.1, 1.2 lib-plugins.php, 1.136, 1.137 lib-security.php, 1.58, 1.59 lib-sessions.php, 1.43, 1.44 lib-story.php, 1.113, 1.114 lib-trackback.php, 1.49, 1.50 lib-user.php, 1.43, 1.44 lib-webservices.php, 1.21, 1.22 memberdetail.thtml, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv9183/public_html
Modified Files:
article.php directory.php getimage.php index.php
lib-common.php pdfgenerator.php profiles.php siteconfig.php
stats.php submit.php users.php usersettings.php
Log Message:
XHTML optional updates
Index: submit.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/submit.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** submit.php 22 Sep 2007 18:37:46 -0000 1.118
--- submit.php 25 Nov 2007 06:55:07 -0000 1.119
***************
*** 80,83 ****
--- 80,84 ----
$loginreq = new Template($_CONF['path_layout'] . 'submit');
$loginreq->set_file('loginreq', 'submitloginrequired.thtml');
+ $loginreq->set_var( 'xhtml', XHTML );
$loginreq->set_var('login_message', $LANG_LOGIN[2]);
$loginreq->set_var('site_url', $_CONF['site_url']);
***************
*** 140,144 ****
file_exists ($_CONF['path_layout'] . 'submit/submitstory_advanced.thtml')) {
$storyform->set_file('storyform','submitstory_advanced.thtml');
! $storyform->set_var ('change_editormode', 'onChange="change_editmode(this);"');
$storyform->set_var ('lang_expandhelp', $LANG24[67]);
$storyform->set_var ('lang_reducehelp', $LANG24[68]);
--- 141,145 ----
file_exists ($_CONF['path_layout'] . 'submit/submitstory_advanced.thtml')) {
$storyform->set_file('storyform','submitstory_advanced.thtml');
! $storyform->set_var ('change_editormode', 'onchange="change_editmode(this);"');
$storyform->set_var ('lang_expandhelp', $LANG24[67]);
$storyform->set_var ('lang_reducehelp', $LANG24[68]);
***************
*** 160,163 ****
--- 161,165 ----
}
}
+ $storyform->set_var ( 'xhtml', XHTML );
$storyform->set_var ('site_url', $_CONF['site_url']);
$storyform->set_var ('layout_url', $_CONF['layout_url']);
***************
*** 206,210 ****
if (($_CONF['skip_preview'] == 1) || ($_POST['mode'] == $LANG12[32])) {
PLG_templateSetVars ('story', $storyform);
! $storyform->set_var('save_button', '<input name="mode" type="submit" value="' . $LANG12[8] . '">');
}
--- 208,212 ----
if (($_CONF['skip_preview'] == 1) || ($_POST['mode'] == $LANG12[32])) {
PLG_templateSetVars ('story', $storyform);
! $storyform->set_var('save_button', '<input name="mode" type="submit" value="' . $LANG12[8] . '"' . XHTML . '>');
}
Index: siteconfig.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/siteconfig.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** siteconfig.php 12 Oct 2007 01:47:57 -0000 1.4
--- siteconfig.php 25 Nov 2007 06:55:07 -0000 1.5
***************
*** 3,7 ****
global $_CONF;
! $_CONF['path'] = '/path/to/geeklog/';
$_CONF['path_system'] = $_CONF['path'] . 'system/';
--- 3,7 ----
global $_CONF;
! $_CONF['path'] = 'W:/path/to/Geeklog/';
$_CONF['path_system'] = $_CONF['path'] . 'system/';
Index: index.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/index.php,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** index.php 29 Jul 2007 07:50:07 -0000 1.95
--- index.php 25 Nov 2007 06:55:07 -0000 1.96
***************
*** 137,144 ****
$header = '<link rel="microsummary" href="' . $_CONF['site_url']
. '/index.php?display=microsummary&topic=' . urlencode($topic)
! . '" title="Microsummary">';
} else {
$header = '<link rel="microsummary" href="' . $_CONF['site_url']
! . '/index.php?display=microsummary" title="Microsummary">';
}
$display .= COM_siteHeader('menu', '', $header);
--- 137,144 ----
$header = '<link rel="microsummary" href="' . $_CONF['site_url']
. '/index.php?display=microsummary&topic=' . urlencode($topic)
! . '" title="Microsummary"' . XHTML . '>';
} else {
$header = '<link rel="microsummary" href="' . $_CONF['site_url']
! . '/index.php?display=microsummary" title="Microsummary"' . XHTML . '>';
}
$display .= COM_siteHeader('menu', '', $header);
***************
*** 162,165 ****
--- 162,166 ----
$topspan = new Template($_CONF['path_layout']);
$topspan->set_file (array ('topspan'=>'topcenterblock-span.thtml'));
+ $topspan->set_var( 'xhtml', XHTML );
$topspan->parse ('output', 'topspan');
$display .= $topspan->finish ($topspan->get_var('output'));
Index: pdfgenerator.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/pdfgenerator.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pdfgenerator.php 11 Oct 2004 01:37:08 -0000 1.11
--- pdfgenerator.php 25 Nov 2007 06:55:07 -0000 1.12
***************
*** 199,202 ****
--- 199,203 ----
));
+ $pdf->set_var( 'xhtml', XHTML );
$pdf->set_var('layout_url', $_CONF['layout_url']);
$pdf->set_var('site_url', $_CONF['site_url']);
***************
*** 210,216 ****
$waitTime=10;
}
! $pdf->set_var('meta_tag', "<META HTTP-EQUIV=REFRESH CONTENT=\"$waitTime; URL=$urlpath\">");
} else {
! $pdf->set_var('meta_tag', "<META HTTP-EQUIV=REFRESH CONTENT=\"0; URL=$urlpath\">");
}
$pdf->parse('page', 'pdf' );
--- 211,217 ----
$waitTime=10;
}
! $pdf->set_var('meta_tag', "<meta http-equiv=\"refresh\" content=\"$waitTime; url=$urlpath\"" . XHTML . ">");
} else {
! $pdf->set_var('meta_tag', "<meta http-equiv=\"refresh\" content=\"0; url=$urlpath\"" . XHTML . ">");
}
$pdf->parse('page', 'pdf' );
***************
*** 224,227 ****
--- 225,229 ----
));
+ $pdf->set_var( 'xhtml', XHTML );
$pdf->set_var('layout_url', $_CONF['layout_url']);
$pdf->set_var('site_url', $_CONF['site_url']);
Index: directory.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/directory.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** directory.php 12 Feb 2007 06:52:58 -0000 1.17
--- directory.php 25 Nov 2007 06:55:07 -0000 1.18
***************
*** 51,54 ****
--- 51,55 ----
$login = new Template ($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login' => 'submitloginrequired.thtml'));
+ $login->set_var ( 'xhtml', XHTML );
$login->set_var ('site_url', $_CONF['site_url']);
$login->set_var ('layout_url', $_CONF['layout_url']);
***************
*** 105,109 ****
$url = $_CONF['site_url'] . '/' . THIS_SCRIPT;
! $retval .= '<form action="' . $url . '" method="POST"';
if (!$standalone) {
$retval .= ' style="display:inline; float:right"' . LB;
--- 106,110 ----
$url = $_CONF['site_url'] . '/' . THIS_SCRIPT;
! $retval .= '<form action="' . $url . '" method="post"';
if (!$standalone) {
$retval .= ' style="display:inline; float:right"' . LB;
***************
*** 118,123 ****
$retval .= COM_topicList ('tid,topic', $topic);
$retval .= '</select>' . LB;
! $retval .= '<input type="hidden" name="year" value="' . $year . '">';
! $retval .= '<input type="hidden" name="month" value="' . $month . '">';
$retval .= '</div></form>' . LB;
--- 119,124 ----
$retval .= COM_topicList ('tid,topic', $topic);
$retval .= '</select>' . LB;
! $retval .= '<input type="hidden" name="year" value="' . $year . '"' . XHTML . '>';
! $retval .= '<input type="hidden" name="month" value="' . $month . '"' . XHTML . '>';
$retval .= '</div></form>' . LB;
***************
*** 426,430 ****
$retval .= DIR_displayMonth ($topic, $currentyear, $currentmonth);
! $retval .= '<hr>' . LB;
}
--- 427,431 ----
$retval .= DIR_displayMonth ($topic, $currentyear, $currentmonth);
! $retval .= '<hr' . XHTML . '>' . LB;
}
Index: users.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/users.php,v
retrieving revision 1.158
retrieving revision 1.159
diff -C2 -d -r1.158 -r1.159
*** users.php 23 Sep 2007 19:20:40 -0000 1.158
--- users.php 25 Nov 2007 06:55:07 -0000 1.159
***************
*** 79,82 ****
--- 79,83 ----
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
+ $login->set_var ( 'xhtml', XHTML );
$login->set_var ('login_message', $LANG_LOGIN[2]);
$login->set_var ('site_url', $_CONF['site_url']);
***************
*** 117,120 ****
--- 118,122 ----
'row' => 'commentrow.thtml',
'strow' => 'storyrow.thtml'));
+ $user_templates->set_var ( 'xhtml', XHTML );
$user_templates->set_var ('site_url', $_CONF['site_url']);
$user_templates->set_var ('start_block_userprofile',
***************
*** 151,155 ****
$edit_icon = '<img src="' . $_CONF['layout_url'] . '/images/edit.'
. $_IMAGE_TYPE . '" alt="' . $LANG_ADMIN['edit']
! . '" title="' . $LANG_ADMIN['edit'] . '">';
$edit_link_url = COM_createLink($edit_icon,
"{$_CONF['site_admin_url']}/user.php?mode=edit&uid={$A['uid']}");
--- 153,157 ----
$edit_icon = '<img src="' . $_CONF['layout_url'] . '/images/edit.'
. $_IMAGE_TYPE . '" alt="' . $LANG_ADMIN['edit']
! . '" title="' . $LANG_ADMIN['edit'] . '"' . XHTML . '>';
$edit_link_url = COM_createLink($edit_icon,
"{$_CONF['site_admin_url']}/user.php?mode=edit&uid={$A['uid']}");
***************
*** 435,438 ****
--- 437,441 ----
$pwform = new Template ($_CONF['path_layout'] . 'users');
$pwform->set_file (array ('newpw' => 'newpassword.thtml'));
+ $pwform->set_var ( 'xhtml', XHTML );
$pwform->set_var ('site_url', $_CONF['site_url']);
$pwform->set_var ('layout_url', $_CONF['layout_url']);
***************
*** 587,590 ****
--- 590,594 ----
$user_templates = new Template ($_CONF['path_layout'] . 'users');
$user_templates->set_file('login', 'loginform.thtml');
+ $user_templates->set_var( 'xhtml', XHTML );
$user_templates->set_var('site_url', $_CONF['site_url']);
if ($statusmode == 0) {
***************
*** 682,685 ****
--- 686,690 ----
$user_templates = new Template($_CONF['path_layout'] . 'users');
$user_templates->set_file('regform', 'registrationform.thtml');
+ $user_templates->set_var( 'xhtml', XHTML );
$user_templates->set_var('site_url', $_CONF['site_url']);
$user_templates->set_var('start_block', COM_startBlock($LANG04[22]));
***************
*** 732,735 ****
--- 737,741 ----
$user_templates = new Template($_CONF['path_layout'] . 'users');
$user_templates->set_file('form', 'getpasswordform.thtml');
+ $user_templates->set_var( 'xhtml', XHTML );
$user_templates->set_var('site_url', $_CONF['site_url']);
$user_templates->set_var('start_block_forgetpassword', COM_startBlock($LANG04[25]));
***************
*** 891,896 ****
or ($_POST['passwd'] != $_POST['passwd_conf']) ) {
$display = COM_refresh ($_CONF['site_url']
! . '/users.php?mode=newpwd&uid=' . $_POST['uid']
! . '&rid=' . $_POST['rid']);
} else {
$uid = COM_applyFilter ($_POST['uid'], true);
--- 897,902 ----
or ($_POST['passwd'] != $_POST['passwd_conf']) ) {
$display = COM_refresh ($_CONF['site_url']
! . '/users.php?mode=newpwd&uid=' . $_POST['uid']
! . '&rid=' . $_POST['rid']);
} else {
$uid = COM_applyFilter ($_POST['uid'], true);
Index: profiles.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/profiles.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** profiles.php 9 Dec 2006 21:02:51 -0000 1.52
--- profiles.php 25 Nov 2007 06:55:07 -0000 1.53
***************
*** 167,170 ****
--- 167,171 ----
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
+ $login->set_var ( 'xhtml', XHTML );
$login->set_var ('login_message', $LANG_LOGIN[2]);
$login->set_var ('site_url', $_CONF['site_url']);
***************
*** 190,193 ****
--- 191,195 ----
$mail_template = new Template ($_CONF['path_layout'] . 'profiles');
$mail_template->set_file ('form', 'contactuserform.thtml');
+ $mail_template->set_var ( 'xhtml', XHTML );
$mail_template->set_var ('site_url', $_CONF['site_url']);
$mail_template->set_var ('lang_description', $LANG08[26]);
***************
*** 358,361 ****
--- 360,364 ----
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
+ $login->set_var ( 'xhtml', XHTML );
$login->set_var ('login_message', $LANG_LOGIN[2]);
$login->set_var ('site_url', $_CONF['site_url']);
***************
*** 384,387 ****
--- 387,391 ----
$mail_template = new Template($_CONF['path_layout'] . 'profiles');
$mail_template->set_file('form', 'contactauthorform.thtml');
+ $mail_template->set_var( 'xhtml', XHTML );
$mail_template->set_var('site_url', $_CONF['site_url']);
$mail_template->set_var('start_block_mailstory2friend', COM_startBlock($LANG08[17]));
Index: lib-common.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.663
retrieving revision 1.664
diff -C2 -d -r1.663 -r1.664
*** lib-common.php 29 Oct 2007 13:42:31 -0000 1.663
--- lib-common.php 25 Nov 2007 06:55:07 -0000 1.664
***************
*** 857,860 ****
--- 857,861 ----
'rightblocks' => 'rightblocks.thtml'
));
+ $header->set_var( 'xhtml', XHTML );
// get topic if not on home page
***************
*** 914,918 ****
. $format_type . '+xml" hreflang="' . $A['language']
. '" href="' . $baseurl . $A['filename'] . '" title="'
! . $format_name . ' Feed: ' . $A['title'] . '">';
}
}
--- 915,919 ----
. $format_type . '+xml" hreflang="' . $A['language']
. '" href="' . $baseurl . $A['filename'] . '" title="'
! . $format_name . ' Feed: ' . $A['title'] . '"' . XHTML . '>';
}
}
***************
*** 924,928 ****
{
$relLinks['home'] = '<link rel="home" href="' . $_CONF['site_url']
! . '/" title="' . $LANG01[90] . '">';
}
$loggedInUser = !COM_isAnonUser();
--- 925,929 ----
{
$relLinks['home'] = '<link rel="home" href="' . $_CONF['site_url']
! . '/" title="' . $LANG01[90] . '"' . XHTML . '>';
}
$loggedInUser = !COM_isAnonUser();
***************
*** 935,939 ****
$relLinks['search'] = '<link rel="search" href="'
. $_CONF['site_url'] . '/search.php" title="'
! . $LANG01[75] . '">';
}
}
--- 936,940 ----
$relLinks['search'] = '<link rel="search" href="'
. $_CONF['site_url'] . '/search.php" title="'
! . $LANG01[75] . '"' . XHTML . '>';
}
}
***************
*** 944,948 ****
$relLinks['contents'] = '<link rel="contents" href="'
. $_CONF['site_url'] . '/directory.php" title="'
! . $LANG01[117] . '">';
}
}
--- 945,949 ----
$relLinks['contents'] = '<link rel="contents" href="'
. $_CONF['site_url'] . '/directory.php" title="'
! . $LANG01[117] . '"' . XHTML . '>';
}
}
***************
*** 1212,1218 ****
$tmp = $header->parse( 'index_header', 'header' );
ob_start();
eval( '?>' . $tmp );
! $retval = ob_get_contents();
ob_end_clean();
--- 1213,1229 ----
$tmp = $header->parse( 'index_header', 'header' );
+ $xml_declaration = '';
+ if ( get_cfg_var('short_open_tag') == '1' )
+ {
+ if ( preg_match( '/(<\?xml[^>]*>)(.*)/s', $tmp, $match ) )
+ {
+ $xml_declaration = $match[1] . LB;
+ $tmp = $match[2];
+ }
+ }
+
ob_start();
eval( '?>' . $tmp );
! $retval = $xml_declaration . ob_get_contents();
ob_end_clean();
***************
*** 1275,1278 ****
--- 1286,1290 ----
DB_change( $_TABLES['vars'], 'value', 'value + 1', 'name', 'totalhits', '', true );
+ $footer->set_var( 'xhtml', XHTML );
$footer->set_var( 'site_url', $_CONF['site_url']);
$footer->set_var( 'layout_url',$_CONF['layout_url']);
***************
*** 1292,1296 ****
}
$footer->set_var( 'copyright_notice', ' ' . $LANG01[93] . ' © '
! . $copyrightyear . ' ' . $_CONF['site_name'] . '<br> '
. $LANG01[94] );
$footer->set_var( 'copyright_msg', $LANG01[93] . ' © '
--- 1304,1308 ----
}
$footer->set_var( 'copyright_notice', ' ' . $LANG01[93] . ' © '
! . $copyrightyear . ' ' . $_CONF['site_name'] . '<br' . XHTML . '> '
. $LANG01[94] );
$footer->set_var( 'copyright_msg', $LANG01[93] . ' © '
***************
*** 1452,1455 ****
--- 1464,1468 ----
$block->set_file( 'block', $template );
+ $block->set_var( 'xhtml', XHTML );
$block->set_var( 'site_url', $_CONF['site_url'] );
$block->set_var( 'layout_url', $_CONF['layout_url'] );
***************
*** 1479,1483 ****
{
$helpimg = $_CONF['layout_url'] . '/images/button_help.' . $_IMAGE_TYPE;
! $help_content = '<img src="' . $helpimg. '" alt="?">';
$help_attr = array('class'=>'blocktitle');
if( !stristr( $helpfile, 'http://' ))
--- 1492,1496 ----
{
$helpimg = $_CONF['layout_url'] . '/images/button_help.' . $_IMAGE_TYPE;
! $help_content = '<img src="' . $helpimg. '" alt="?"' . XHTML . '>';
$help_attr = array('class'=>'blocktitle');
if( !stristr( $helpfile, 'http://' ))
***************
*** 1513,1516 ****
--- 1526,1530 ----
$block->set_file( 'block', $template );
+ $block->set_var( 'xhtml', XHTML );
$block->set_var( 'site_url', $_CONF['site_url'] );
$block->set_var( 'layout_url', $_CONF['layout_url'] );
***************
*** 1766,1774 ****
if(( $table == $_TABLES['blocks'] ) && isset( $A[2] ) && ( $A[2] == 'gldefault' ))
{
! $retval .= '><span class="gldefault">' . stripslashes( $A[1] ) . '</span></li>' . LB;
}
else
{
! $retval .= '><span>' . stripslashes( $A[1] ) . '</span></li>' . LB;
}
}
--- 1780,1788 ----
if(( $table == $_TABLES['blocks'] ) && isset( $A[2] ) && ( $A[2] == 'gldefault' ))
{
! $retval .= XHTML . '><span class="gldefault">' . stripslashes( $A[1] ) . '</span></li>' . LB;
}
else
{
! $retval .= XHTML . '><span>' . stripslashes( $A[1] ) . '</span></li>' . LB;
}
}
***************
*** 1926,1930 ****
if( !$file = fopen( $logfile, 'a' ))
{
! $retval .= $LANG01[33] . ' ' . $logfile . ' (' . $timestamp . ')<br>' . LB;
}
else
--- 1940,1944 ----
if( !$file = fopen( $logfile, 'a' ))
{
! $retval .= $LANG01[33] . ' ' . $logfile . ' (' . $timestamp . ')<br' . XHTML . '>' . LB;
}
else
***************
*** 1947,1951 ****
if( !$file = fopen( $logfile, 'a' ))
{
! $retval .= $LANG01[33] . ' ' . $logfile . ' (' . $timestamp . ')<br>' . LB;
}
else
--- 1961,1965 ----
if( !$file = fopen( $logfile, 'a' ))
{
! $retval .= $LANG01[33] . ' ' . $logfile . ' (' . $timestamp . ')<br' . XHTML . '>' . LB;
}
else
***************
*** 1992,1996 ****
if( !$file = fopen( $logfile, 'a' ))
{
! return $LANG01[33] . $logfile . ' (' . $timestamp . ')<br>' . LB;
}
--- 2006,2010 ----
if( !$file = fopen( $logfile, 'a' ))
{
! return $LANG01[33] . $logfile . ' (' . $timestamp . ')<br' . XHTML . '>' . LB;
}
***************
*** 2078,2081 ****
--- 2092,2096 ----
}
$retval = '<ul>';
+ $sections->set_var( 'xhtml', XHTML );
$sections->set_var( 'site_url', $_CONF['site_url'] );
$sections->set_var( 'layout_url', $_CONF['layout_url'] );
***************
*** 2179,2183 ****
$imageurl = COM_getTopicImageUrl( $A['imageurl'] );
$topicimage = '<img src="' . $imageurl . '" alt="' . $topicname
! . '" title="' . $topicname . '" border="0">';
}
$sections->set_var( 'topic_image', $topicimage );
--- 2194,2198 ----
$imageurl = COM_getTopicImageUrl( $A['imageurl'] );
$topicimage = '<img src="' . $imageurl . '" alt="' . $topicname
! . '" title="' . $topicname . '" border="0"' . XHTML . '>';
}
$sections->set_var( 'topic_image', $topicimage );
***************
*** 2227,2230 ****
--- 2242,2246 ----
'current' => 'useroption_off.thtml' ));
}
+ $usermenu->set_var( 'xhtml', XHTML );
$usermenu->set_var( 'site_url', $_CONF['site_url'] );
$usermenu->set_var( 'layout_url', $_CONF['layout_url'] );
***************
*** 2301,2307 ****
$retval .= COM_startBlock( $LANG01[47], $help,
COM_getBlockTemplate( 'user_block', 'header' ));
! $retval .= '<ul>';
$login = new Template( $_CONF['path_layout'] );
$login->set_file( 'form', 'loginform.thtml' );
$login->set_var( 'site_url', $_CONF['site_url'] );
$login->set_var( 'layout_url', $_CONF['layout_url'] );
--- 2317,2324 ----
$retval .= COM_startBlock( $LANG01[47], $help,
COM_getBlockTemplate( 'user_block', 'header' ));
! // $retval .= '<ul>';
$login = new Template( $_CONF['path_layout'] );
$login->set_file( 'form', 'loginform.thtml' );
+ $login->set_var( 'xhtml', XHTML );
$login->set_var( 'site_url', $_CONF['site_url'] );
$login->set_var( 'layout_url', $_CONF['layout_url'] );
***************
*** 2364,2368 ****
$retval .= $login->parse( 'output', 'form' );
! $retval .= '</ul>';
$retval .= COM_endBlock( COM_getBlockTemplate( 'user_block', 'footer' ));
}
--- 2381,2385 ----
$retval .= $login->parse( 'output', 'form' );
! // $retval .= '</ul>';
$retval .= COM_endBlock( COM_getBlockTemplate( 'user_block', 'footer' ));
}
***************
*** 2415,2418 ****
--- 2432,2436 ----
'current' => 'adminoption_off.thtml' ));
}
+ $adminmenu->set_var( 'xhtml', XHTML );
$adminmenu->set_var( 'site_url', $_CONF['site_url'] );
$adminmenu->set_var( 'layout_url', $_CONF['layout_url'] );
***************
*** 2761,2765 ****
function COM_refresh( $url )
{
! return "<html><head><meta http-equiv=\"refresh\" content=\"0; URL=$url\"></head></html>\n";
}
--- 2779,2783 ----
function COM_refresh( $url )
{
! return "<html><head><meta http-equiv=\"refresh\" content=\"0; URL=$url\"" . XHTML . "></head></html>\n";
}
***************
*** 3222,3226 ****
$daylist = preg_replace( "/(\015\012)|(\015)|(\012)/",
'', $daylist );
! $string .= $daylist . '<br>';
}
--- 3240,3244 ----
$daylist = preg_replace( "/(\015\012)|(\015)|(\012)/",
'', $daylist );
! $string .= $daylist . '<br' . XHTML . '>';
}
***************
*** 4067,4081 ****
if( $newstories && ( $page < 2 ))
{
! $retval .= $newmsg . '<br>';
}
else
{
$retval .= COM_createLink($newmsg, $_CONF['site_url']
! . '/index.php?display=new') . '<br>';
}
}
else
{
! $retval .= $LANG01[100] . '<br>';
}
--- 4085,4099 ----
if( $newstories && ( $page < 2 ))
{
! $retval .= $newmsg . '<br' . XHTML . '>';
}
else
{
$retval .= COM_createLink($newmsg, $_CONF['site_url']
! . '/index.php?display=new') . '<br' . XHTML . '>';
}
}
else
{
! $retval .= $LANG01[100] . '<br' . XHTML . '>';
}
***************
*** 4084,4088 ****
|| ( $_CONF['hidenewplugins'] == 0 ))
{
! $retval .= '<br>';
}
}
--- 4102,4106 ----
|| ( $_CONF['hidenewplugins'] == 0 ))
{
! $retval .= '<br' . XHTML . '>';
}
}
***************
*** 4154,4158 ****
else
{
! $retval .= $LANG01[86] . '<br>' . LB;
}
if(( $_CONF['hidenewplugins'] == 0 )
--- 4172,4176 ----
else
{
! $retval .= $LANG01[86] . '<br' . XHTML . '>' . LB;
}
if(( $_CONF['hidenewplugins'] == 0 )
***************
*** 4160,4164 ****
&& ( $_CONF['hidenewtrackbacks'] == 0 )))
{
! $retval .= '<br>';
}
}
--- 4178,4182 ----
&& ( $_CONF['hidenewtrackbacks'] == 0 )))
{
! $retval .= '<br' . XHTML . '>';
}
}
***************
*** 4213,4221 ****
else
{
! $retval .= $LANG01[115] . '<br>' . LB;
}
if( $_CONF['hidenewplugins'] == 0 )
{
! $retval .= '<br>';
}
}
--- 4231,4239 ----
else
{
! $retval .= $LANG01[115] . '<br' . XHTML . '>' . LB;
}
if( $_CONF['hidenewplugins'] == 0 )
{
! $retval .= '<br' . XHTML . '>';
}
}
***************
*** 4242,4246 ****
if( $i + 1 < $plugins )
{
! $retval .= '<br>';
}
}
--- 4260,4264 ----
if( $i + 1 < $plugins )
{
! $retval .= '<br' . XHTML . '>';
}
}
***************
*** 4346,4350 ****
. '<p style="padding:5px"><img src="' . $_CONF['layout_url']
. '/images/sysmessage.' . $_IMAGE_TYPE . '" border="0" align="left"'
! . ' alt="" style="padding-right:5px; padding-bottom:3px">'
. $message . '</p>'
. COM_endBlock( COM_getBlockTemplate( '_msg_block', 'footer' ));
--- 4364,4368 ----
. '<p style="padding:5px"><img src="' . $_CONF['layout_url']
. '/images/sysmessage.' . $_IMAGE_TYPE . '" border="0" align="left"'
! . ' alt="" style="padding-right:5px; padding-bottom:3px"' . XHTML . '>'
. $message . '</p>'
. COM_endBlock( COM_getBlockTemplate( '_msg_block', 'footer' ));
***************
*** 4604,4611 ****
{
$usrimg = '<img src="' . $_CONF['layout_url'] . '/images/smallcamera.'
! . $_IMAGE_TYPE . '" border="0" alt="">';
$retval .= ' ' . COM_createLink($usrimg, $url);
}
! $retval .= '<br>';
$num_reg++;
}
--- 4622,4629 ----
{
$usrimg = '<img src="' . $_CONF['layout_url'] . '/images/smallcamera.'
! . $_IMAGE_TYPE . '" border="0" alt=""' . XHTML . '>';
$retval .= ' ' . COM_createLink($usrimg, $url);
}
! $retval .= '<br' . XHTML . '>';
$num_reg++;
}
***************
*** 4625,4629 ****
if( $num_reg > 0 )
{
! $retval = $LANG01[112] . ': ' . $num_reg . '<br>';
}
else
--- 4643,4647 ----
if( $num_reg > 0 )
{
! $retval = $LANG01[112] . ': ' . $num_reg . '<br' . XHTML . '>';
}
else
***************
*** 4635,4639 ****
if( $num_anon > 0 )
{
! $retval .= $LANG01[41] . ': ' . $num_anon . '<br>';
}
--- 4653,4657 ----
if( $num_anon > 0 )
{
! $retval .= $LANG01[41] . ': ' . $num_anon . '<br' . XHTML . '>';
}
***************
*** 4946,4949 ****
--- 4964,4968 ----
$list->set_file(array('list' => 'list.thtml',
'listitem' => 'listitem.thtml'));
+ $list->set_var( 'xhtml', XHTML );
$list->set_var('site_url', $_CONF['site_url']);
$list->set_var('layout_url', $_CONF['layout_url']);
***************
*** 6197,6203 ****
{
$retval .= '<form name="change" action="'. $_CONF['site_url']
! . '/switchlang.php" method="GET">' . LB;
$retval .= '<input type="hidden" name="oldlang" value="' . $langId
! . '">' . LB;
$retval .= '<select onchange="change.submit()" name="lang">';
--- 6216,6222 ----
{
$retval .= '<form name="change" action="'. $_CONF['site_url']
! . '/switchlang.php" method="get">' . LB;
$retval .= '<input type="hidden" name="oldlang" value="' . $langId
! . '"' . XHTML . '>' . LB;
$retval .= '<select onchange="change.submit()" name="lang">';
***************
*** 6351,6356 ****
{
echo("
! An error has occurred:<br/>
! $errno - $errstr @ $errfile line $errline<br/>
<pre>");
ob_start();
--- 6370,6375 ----
{
echo("
! An error has occurred:<br" . XHTML . ">
! $errno - $errstr @ $errfile line $errline<br" . XHTML . ">
<pre>");
ob_start();
Index: usersettings.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/usersettings.php,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -d -r1.164 -r1.165
*** usersettings.php 29 Jul 2007 21:40:00 -0000 1.164
--- usersettings.php 25 Nov 2007 06:55:07 -0000 1.165
***************
*** 72,75 ****
--- 72,76 ----
}
$navbar->set_selected($LANG_MYACCOUNT['pe_namepass']);
+ $preferences->set_var ( 'xhtml', XHTML );
$preferences->set_var ('navbar', $navbar->generate());
***************
*** 167,171 ****
}
! $selection = '<select name="cooktime">' . LB;
$selection .= COM_optionList ($_TABLES['cookiecodes'], 'cc_value,cc_descr',
$A['cookietimeout'], 0);
--- 168,176 ----
}
! // @@@@ 2007/09/16 changed by dengen ----->>
! // $selection = '<select name="cooktime">' . LB;
! // @@@@ 2007/09/16 changed by dengen -----||
! $selection = '<select id="cooktime" name="cooktime">' . LB;
! // @@@@ 2007/09/16 changed by dengen -----<<
$selection .= COM_optionList ($_TABLES['cookiecodes'], 'cc_value,cc_descr',
$A['cookietimeout'], 0);
***************
*** 186,193 ****
} else {
if (empty ($A['photo'])) { // external avatar
! $photo = '<br>' . $photo;
} else { // uploaded photo - add delete option
! $photo = '<br>' . $photo . '<br>' . $LANG04[79]
! . ' <input type="checkbox" name="delete_photo">'
. LB;
}
--- 191,198 ----
} else {
if (empty ($A['photo'])) { // external avatar
! $photo = '<br' . XHTML . '>' . $photo;
} else { // uploaded photo - add delete option
! $photo = '<br' . XHTML . '>' . $photo . '<br' . XHTML . '>' . $LANG04[79]
! . ' <input type="checkbox" name="delete_photo"' . XHTML . '>'
. LB;
}
***************
*** 261,265 ****
(md5 ($_POST['old_passwd']) != $_USER['passwd'])) {
return COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=84');
}
--- 266,270 ----
(md5 ($_POST['old_passwd']) != $_USER['passwd'])) {
return COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=84');
}
***************
*** 275,284 ****
$retval .= '<p>' . $LANG04[98] . '</p>' . LB;
$retval .= '<form action="' . $_CONF['site_url']
! . '/usersettings.php" method="POST"><div>' . LB;
$retval .= '<p align="center"><input type="submit" name="btnsubmit" value="'
! . $LANG04[96] . '"></p>' . LB;
! $retval .= '<input type="hidden" name="mode" value="deleteconfirmed">' . LB;
$retval .= '<input type="hidden" name="account_id" value="' . $reqid
! . '">' . LB;
$retval .= '</div></form>' . LB;
$retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
--- 280,289 ----
$retval .= '<p>' . $LANG04[98] . '</p>' . LB;
$retval .= '<form action="' . $_CONF['site_url']
! . '/usersettings.php" method="post"><div>' . LB;
$retval .= '<p align="center"><input type="submit" name="btnsubmit" value="'
! . $LANG04[96] . '"' . XHTML . '></p>' . LB;
! $retval .= '<input type="hidden" name="mode" value="deleteconfirmed"' . XHTML . '>' . LB;
$retval .= '<input type="hidden" name="account_id" value="' . $reqid
! . '"' . XHTML . '>' . LB;
$retval .= '</div></form>' . LB;
$retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
***************
*** 372,375 ****
--- 377,381 ----
'privacy' => 'privacyblock.thtml'
));
+ $preferences->set_var ( 'xhtml', XHTML );
$preferences->set_var ('site_url', $_CONF['site_url']);
$preferences->set_var ('layout_url', $_CONF['layout_url']);
***************
*** 477,481 ****
}
! $selection = '<select name="language">' . LB;
foreach ($language as $langFile => $langName) {
$selection .= '<option value="' . $langFile . '"';
--- 483,492 ----
}
! // @@@@ 2007/09/16 changed by dengen ----->>
! // $selection = '<select name="language">' . LB;
! // @@@@ 2007/09/16 changed by dengen -----||
! $selection = '<select id="language" name="language">' . LB;
! // @@@@ 2007/09/16 changed by dengen -----<<
!
foreach ($language as $langFile => $langName) {
$selection .= '<option value="' . $langFile . '"';
***************
*** 498,502 ****
if ($_CONF['allow_user_themes'] == 1) {
! $selection = '<select name="theme">' . LB;
if (empty ($_USER['theme'])) {
--- 509,517 ----
if ($_CONF['allow_user_themes'] == 1) {
! // @@@@ 2007/09/16 changed by dengen ----->>
! // $selection = '<select name="theme">' . LB;
! // @@@@ 2007/09/16 changed by dengen -----||
! $selection = '<select id="theme" name="theme">' . LB;
! // @@@@ 2007/09/16 changed by dengen -----<<
if (empty ($_USER['theme'])) {
***************
*** 544,553 ****
$timezone = $tz_obj->id;
}
! $selection = '<select name="tzid">' . LB;
$T = $GLOBALS['_DATE_TIMEZONE_DATA'];
while ($tDetails = current($T)) {
! $tzcode = key($T);
$selection .= '<option value="' . $tzcode . '"';
if ($timezone == $tzcode) {
--- 559,576 ----
$timezone = $tz_obj->id;
}
! // @@@@ 2007/09/16 changed by dengen ----->>
! // $selection = '<select name="tzid">' . LB;
! // @@@@ 2007/09/16 changed by dengen -----||
! $selection = '<select id="tzid" name="tzid">' . LB;
! // @@@@ 2007/09/16 changed by dengen -----<<
$T = $GLOBALS['_DATE_TIMEZONE_DATA'];
while ($tDetails = current($T)) {
! // @@@@ 2007/09/16 changed by dengen ----->>
! // $tzcode = key($T);
! // @@@@ 2007/09/16 changed by dengen -----||
! $tzcode = htmlspecialchars(key($T));
! // @@@@ 2007/09/16 changed by dengen -----<<
$selection .= '<option value="' . $tzcode . '"';
if ($timezone == $tzcode) {
***************
*** 580,584 ****
$preferences->set_var ('maxstories_value', $A['maxstories']);
! $selection = '<select name="dfid">' . LB
. COM_optionList ($_TABLES['dateformats'], 'dfid,description',
$A['dfid']) . '</select>';
--- 603,611 ----
$preferences->set_var ('maxstories_value', $A['maxstories']);
! // @@@@ 2007/09/16 changed by dengen
! // $selection = '<select name="dfid">' . LB
! // @@@@ 2007/09/16 changed by dengen
! $selection = '<select id="dfid" name="dfid">' . LB
! // @@@@ 2007/09/16 changed by dengen
. COM_optionList ($_TABLES['dateformats'], 'dfid,description',
$A['dfid']) . '</select>';
***************
*** 640,644 ****
$Selboxsize = 15;
}
! $preferences->set_var ('exclude_author_checklist', '<select name="selauthors[]" multiple size='. $Selboxsize. '>' . $selauthors . '</select>');
} else {
$preferences->set_var ('lang_authors', '');
--- 667,671 ----
$Selboxsize = 15;
}
! $preferences->set_var ('exclude_author_checklist', '<select name="selauthors[]" multiple="multiple" size="'. $Selboxsize. '">' . $selauthors . '</select>');
} else {
$preferences->set_var ('lang_authors', '');
***************
*** 698,702 ****
if (empty ($A['commentlimit'])) $A['commentlimit'] = 100;
! $selection = '<select name="commentmode">';
$selection .= COM_optionList ($_TABLES['commentmodes'], 'mode,name',
$A['commentmode']);
--- 725,733 ----
if (empty ($A['commentlimit'])) $A['commentlimit'] = 100;
! // @@@@ 2007/09/16 changed by dengen ----->>
! // $selection = '<select name="commentmode">';
! // @@@@ 2007/09/16 changed by dengen -----||
! $selection = '<select id="commentmode" name="commentmode">';
! // @@@@ 2007/09/16 changed by dengen -----<<
$selection .= COM_optionList ($_TABLES['commentmodes'], 'mode,name',
$A['commentmode']);
***************
*** 704,708 ****
$preferences->set_var ('displaymode_selector', $selection);
! $selection = '<select name="commentorder">';
$selection .= COM_optionList ($_TABLES['sortcodes'], 'code,name',
$A['commentorder']);
--- 735,743 ----
$preferences->set_var ('displaymode_selector', $selection);
! // @@@@ 2007/09/16 changed by dengen ----->>
! // $selection = '<select name="commentorder">';
! // @@@@ 2007/09/16 changed by dengen -----||
! $selection = '<select id="commentorder" name="commentorder">';
! // @@@@ 2007/09/16 changed by dengen -----<<
$selection .= COM_optionList ($_TABLES['sortcodes'], 'code,name',
$A['commentorder']);
***************
*** 896,900 ****
return COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=83');
}
}
--- 931,935 ----
return COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=83');
}
}
***************
*** 931,935 ****
} else {
return COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=51');
}
}
--- 966,970 ----
} else {
return COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=51');
}
}
***************
*** 953,961 ****
elseif (md5 ($A['old_passwd']) != $_USER['passwd']) {
return COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=68');
}
elseif ($A['passwd'] != $A['passwd_conf']) {
return COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=67');
}
}
--- 988,996 ----
elseif (md5 ($A['old_passwd']) != $_USER['passwd']) {
return COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=68');
}
elseif ($A['passwd'] != $A['passwd_conf']) {
return COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=67');
}
}
***************
*** 964,969 ****
$profile = '<h1>' . $LANG04[1] . ' ' . $_USER['username'] . '</h1>'
. '<p>'. COM_createLink($A['homepage'], $A['homepage'])
! . '<br>' . $A['location'] . '<br>' . $A['sig'] . '<br>'
! . $A['about'] . '<br>' . $A['pgpkey'] . '</p>';
$result = PLG_checkforSpam ($profile, $_CONF['spamx']);
if ($result > 0) {
--- 999,1004 ----
$profile = '<h1>' . $LANG04[1] . ' ' . $_USER['username'] . '</h1>'
. '<p>'. COM_createLink($A['homepage'], $A['homepage'])
! . '<br' . XHTML . '>' . $A['location'] . '<br' . XHTML . '>' . $A['sig'] . '<br' . XHTML . '>'
! . $A['about'] . '<br' . XHTML . '>' . $A['pgpkey'] . '</p>';
$result = PLG_checkforSpam ($profile, $_CONF['spamx']);
if ($result > 0) {
***************
*** 984,994 ****
if (!COM_isEmail ($A['email'])) {
return COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=52');
} else if ($A['email'] !== $A['email_conf']) {
return COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=78');
} else if (emailAddressExists ($A['email'], $_USER['uid'])) {
return COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=56');
} else {
if ($_US_VERBOSE) {
--- 1019,1029 ----
if (!COM_isEmail ($A['email'])) {
return COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=52');
} else if ($A['email'] !== $A['email_conf']) {
return COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=78');
} else if (emailAddressExists ($A['email'], $_USER['uid'])) {
return COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=56');
} else {
if ($_US_VERBOSE) {
***************
*** 1056,1061 ****
}
! return COM_refresh ($_CONF['site_url'] . '/users.php?mode=profile&uid='
! . $_USER['uid'] . '&msg=5');
}
}
--- 1091,1096 ----
}
! return COM_refresh ($_CONF['site_url'] . '/users.php?mode=profile&uid='
! . $_USER['uid'] . '&msg=5');
}
}
***************
*** 1084,1087 ****
--- 1119,1123 ----
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
+ $login->set_var ( 'xhtml', XHTML );
$login->set_var ('login_message', $LANG_LOGIN[2]);
$login->set_var ('site_url', $_CONF['site_url']);
***************
*** 1113,1116 ****
--- 1149,1153 ----
'row' => 'commentrow.thtml',
'strow' => 'storyrow.thtml'));
+ $user_templates->set_var ( 'xhtml', XHTML );
$user_templates->set_var ('site_url', $_CONF['site_url']);
$user_templates->set_var ('start_block_userprofile',
***************
*** 1130,1134 ****
$edit_icon = '<img src="' . $_CONF['layout_url'] . '/images/edit.'
. $_IMAGE_TYPE . '" alt="' . $LANG_ADMIN['edit']
! . '" title="' . $LANG_ADMIN['edit'] . '">';
$edit_link_url = COM_createLink(
$edit_icon,
--- 1167,1171 ----
$edit_icon = '<img src="' . $_CONF['layout_url'] . '/images/edit.'
. $_IMAGE_TYPE . '" alt="' . $LANG_ADMIN['edit']
! . '" title="' . $LANG_ADMIN['edit'] . '"' . XHTML . '>';
$edit_link_url = COM_createLink(
$edit_icon,
***************
*** 1487,1491 ****
savepreferences ($_POST);
$display .= COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=preferences&msg=6');
break;
--- 1524,1528 ----
savepreferences ($_POST);
$display .= COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=preferences&msg=6');
break;
***************
*** 1519,1523 ****
PLG_profileExtrasSave ($_POST['plugin']);
$display = COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=5');
break;
default: // also if $mode == 'preferences' or 'comments'
--- 1556,1560 ----
PLG_profileExtrasSave ($_POST['plugin']);
$display = COM_refresh ($_CONF['site_url']
! . '/usersettings.php?mode=edit&msg=5');
break;
default: // also if $mode == 'preferences' or 'comments'
***************
*** 1537,1541 ****
$display .= COM_siteHeader ('menu');
$display .= COM_startBlock ($LANG04[70] . '!');
! $display .= '<br>' . $LANG04[71] . '<br><br>';
$display .= COM_endBlock ();
$display .= COM_siteFooter ();
--- 1574,1578 ----
$display .= COM_siteHeader ('menu');
$display .= COM_startBlock ($LANG04[70] . '!');
! $display .= '<br' . XHTML . '>' . $LANG04[71] . '<br' . XHTML . '><br' . XHTML . '>';
$display .= COM_endBlock ();
$display .= COM_siteFooter ();
Index: getimage.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/getimage.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** getimage.php 26 May 2006 13:35:39 -0000 1.7
--- getimage.php 25 Nov 2007 06:55:07 -0000 1.8
***************
*** 93,97 ****
if (is_file($downloader->getPath() . $image)) {
if ($mode == 'show') {
! echo '<html><body><img src="' . $_CONF['site_url'] . '/getimage.php?mode=articles&image=' . $image . '" alt=""></body></html>';
} else {
$downloader->downloadFile($image);
--- 93,97 ----
if (is_file($downloader->getPath() . $image)) {
if ($mode == 'show') {
! echo '<html><body><img src="' . $_CONF['site_url'] . '/getimage.php?mode=articles&image=' . $image . '" alt=""' . XHTML . '></body></html>';
} else {
$downloader->downloadFile($image);
Index: stats.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/stats.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** stats.php 6 Mar 2007 05:04:34 -0000 1.51
--- stats.php 25 Nov 2007 06:55:07 -0000 1.52
***************
*** 47,50 ****
--- 47,51 ----
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
+ $login->set_var ( 'xhtml', XHTML );
$login->set_var ('login_message', $LANG_LOGIN[2]);
$login->set_var ('site_url', $_CONF['site_url']);
Index: article.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/article.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** article.php 19 Aug 2007 16:28:02 -0000 1.93
--- article.php 25 Nov 2007 06:55:07 -0000 1.94
***************
*** 144,147 ****
--- 144,148 ----
$story_template = new Template ($_CONF['path_layout'] . 'article');
$story_template->set_file ('article', 'printable.thtml');
+ $story_template->set_var ( 'xhtml', XHTML );
$story_template->set_var ('page_title',
$_CONF['site_name'] . ': ' . $story->displayElements('title'));
***************
*** 189,192 ****
--- 190,233 ----
$story_template->set_var ('lang_full_article', $LANG08[33]);
$story_template->set_var ('article_url', $articleUrl);
+
+ $langAttr = '';
+ if( !empty( $_CONF['languages'] ) && !empty( $_CONF['language_files'] ))
+ {
+ $langId = COM_getLanguageId();
+ }
+ else
+ {
+ // try to derive the language id from the locale
+ $l = explode( '.', $_CONF['locale'] );
+ $langId = $l[0];
+ }
+ if( !empty( $langId ))
+ {
+ $l = explode( '-', str_replace( '_', '-', $langId ));
+ if(( count( $l ) == 1 ) && ( strlen( $langId ) == 2 ))
+ {
+ $langAttr = 'lang="' . $langId . '"';
+ }
+ else if( count( $l ) == 2 )
+ {
+ if(( $l[0] == 'i' ) || ( $l[0] == 'x' ))
+ {
+ $langId = implode( '-', $l );
+ $langAttr = 'lang="' . $langId . '"';
+ }
+ else if( strlen( $l[0] ) == 2 )
+ {
+ $langId = implode( '-', $l );
+ $langAttr = 'lang="' . $langId . '"';
+ }
+ else
+ {
+ $langId = $l[0];
+ }
+ }
+ }
+ $story_template->set_var( 'lang_id', $langId );
+ $story_template->set_var( 'lang_attribute', $langAttr );
+
$story_template->parse ('output', 'article');
$display = $story_template->finish ($story_template->get_var('output'));
***************
*** 222,225 ****
--- 263,267 ----
$story_template->set_file('article','article.thtml');
+ $story_template->set_var( 'xhtml', XHTML );
$story_template->set_var('site_url', $_CONF['site_url']);
$story_template->set_var('layout_url', $_CONF['layout_url']);
- Previous message (by thread): [geeklog-cvs] Geeklog-1.x/sql mssql_tableanddata.php, 1.30, 1.31 mysql_tableanddata.php, 1.193, 1.194
- Next message (by thread): [geeklog-cvs] Geeklog-1.x/system lib-admin.php, 1.123, 1.124 lib-comment.php, 1.59, 1.60 lib-custom.php, 1.37, 1.38 lib-custom.php.dist, 1.1, 1.2 lib-plugins.php, 1.136, 1.137 lib-security.php, 1.58, 1.59 lib-sessions.php, 1.43, 1.44 lib-story.php, 1.113, 1.114 lib-trackback.php, 1.49, 1.50 lib-user.php, 1.43, 1.44 lib-webservices.php, 1.21, 1.22 memberdetail.thtml, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the geeklog-cvs
mailing list