[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
Oliver
ospiess at qs1489.pair.com
Sun Nov 25 01:55:09 EST 2007
- Previous message (by thread): [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
- Next message (by thread): [geeklog-cvs] Geeklog-1.x/language english.php, 1.307, 1.308 english_utf-8.php, 1.92, 1.93 japanese.php, 1.35, 1.36 japanese_utf-8.php, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv9183/system
Modified Files:
lib-admin.php lib-comment.php lib-custom.php
lib-custom.php.dist lib-plugins.php lib-security.php
lib-sessions.php lib-story.php lib-trackback.php lib-user.php
lib-webservices.php memberdetail.thtml
Log Message:
XHTML optional updates
Index: lib-webservices.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/lib-webservices.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** lib-webservices.php 24 Nov 2007 12:42:57 -0000 1.21
--- lib-webservices.php 25 Nov 2007 06:55:07 -0000 1.22
***************
*** 621,625 ****
$link_self->setAttribute('rel', 'edit');
$link_self->setAttribute('type', 'application/atom+xml');
! $link_self->setAttribute('href', $_CONF['site_url'] . '/webservices/atom/?plugin=' . htmlentities($WS_PLUGIN) . '&id=' . htmlentities($arr['id']));
$entry_elem->appendChild($link_self);
}
--- 621,625 ----
$link_self->setAttribute('rel', 'edit');
$link_self->setAttribute('type', 'application/atom+xml');
! $link_self->setAttribute('href', $_CONF['site_url'] . '/webservices/atom/?plugin=' . htmlentities($WS_PLUGIN) . '&id=' . htmlentities($arr['id']));
$entry_elem->appendChild($link_self);
}
Index: memberdetail.thtml
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/memberdetail.thtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** memberdetail.thtml 12 Feb 2007 06:07:46 -0000 1.5
--- memberdetail.thtml 25 Nov 2007 06:55:07 -0000 1.6
***************
*** 3,28 ****
{startblock}
{message}
! <form action="{post_url}" method="POST">
<table cellspacing="0" cellpadding="2" width="100%">
<tr>
! <td align="right" class="alignleft" style="vertical-align:middle;padding-left:10px;"><b>{USERNAME}</b><br><small style="color:#676767">{USERNAME_HELP}</small></td>
! <td align="left" valign="middle"><input type="text" name="username" size="16" maxlength="16" value="{username}"></td>
</tr>
{passwd_input}
<tr>
! <td align="right" class="alignleft" style="vertical-align:middle;padding-left:10px;"><b>{FULLNAME}</b><br><small style="color:#676767">{FULLNAME_HELP}</small></td>
! <td align="left" valign="middle"><input type="text" name="fullname" size="32" maxlength="80" value="{fullname}"></td>
</tr>
<tr>
! <td align="right" class="alignleft" style="vertical-align:middle;padding-left:10px;"><b>{EMAIL}</b><br><small style="color:#676767">{EMAIL_HELP}</small></td>
! <td align="left" valign="middle"><input type="text" name="email" size="32" maxlength="96" value="{email}"></td>
</tr>
<tr>
! <td align="right" class="alignleft" style="vertical-align:middle;padding-left:10px;"><b>{EMAIL_CONF}</b><br><small style="color:#676767">{EMAIL_CONF_HELP}</small></td>
! <td align="left" valign="middle"><input type="text" name="email_conf" size="32" maxlength="96" value="{email_conf}"></td>
</tr>
<tr>
! <td align="center" colspan="3"><input type="hidden" name="uid" value="{user_id}"><hr><br>
! <input type="hidden" name="mode" value="{postmode}">{submitbutton}</td>
</tr>
</table>
--- 3,28 ----
{startblock}
{message}
! <form action="{post_url}" method="post">
<table cellspacing="0" cellpadding="2" width="100%">
<tr>
! <td align="right" class="alignleft" style="vertical-align:middle;padding-left:10px;"><b>{USERNAME}</b><br{xhtml}><small style="color:#676767">{USERNAME_HELP}</small></td>
! <td align="left" valign="middle"><input type="text" name="username" size="16" maxlength="16" value="{username}"{xhtml}></td>
</tr>
{passwd_input}
<tr>
! <td align="right" class="alignleft" style="vertical-align:middle;padding-left:10px;"><b>{FULLNAME}</b><br{xhtml}><small style="color:#676767">{FULLNAME_HELP}</small></td>
! <td align="left" valign="middle"><input type="text" name="fullname" size="32" maxlength="80" value="{fullname}"{xhtml}></td>
</tr>
<tr>
! <td align="right" class="alignleft" style="vertical-align:middle;padding-left:10px;"><b>{EMAIL}</b><br{xhtml}><small style="color:#676767">{EMAIL_HELP}</small></td>
! <td align="left" valign="middle"><input type="text" name="email" size="32" maxlength="96" value="{email}"{xhtml}></td>
</tr>
<tr>
! <td align="right" class="alignleft" style="vertical-align:middle;padding-left:10px;"><b>{EMAIL_CONF}</b><br{xhtml}><small style="color:#676767">{EMAIL_CONF_HELP}</small></td>
! <td align="left" valign="middle"><input type="text" name="email_conf" size="32" maxlength="96" value="{email_conf}"{xhtml}></td>
</tr>
<tr>
! <td align="center" colspan="3"><input type="hidden" name="uid" value="{user_id}"{xhtml}><hr{xhtml}><br{xhtml}>
! <input type="hidden" name="mode" value="{postmode}"{xhtml}>{submitbutton}</td>
</tr>
</table>
Index: lib-custom.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/lib-custom.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** lib-custom.php 27 Jan 2007 16:20:55 -0000 1.37
--- lib-custom.php 25 Nov 2007 06:55:07 -0000 1.38
***************
*** 108,112 ****
$msg = 81;
}
! $retval = COM_refresh($_CONF['site_url'] .'/index.php?mode=loginfail&msg='.$msg);
echo $retval;
exit;
--- 108,112 ----
$msg = 81;
}
! $retval = COM_refresh($_CONF['site_url'] .'/index.php?mode=loginfail&msg='.$msg);
echo $retval;
exit;
***************
*** 233,239 ****
$retval .= '<tr>
<td align="right"><b>Custom Fields:</b></td>
! <td><input type="text" name="custom1" size="50" value="' . $var .'"></td>
</tr>';
! $retval .= '<tr><td colspan="2"><hr></td></tr>';
return $retval;
--- 233,239 ----
$retval .= '<tr>
<td align="right"><b>Custom Fields:</b></td>
! <td><input type="text" name="custom1" size="50" value="' . $var .'"' . XHTML . '></td>
</tr>';
! $retval .= '<tr><td colspan="2"><hr' . XHTML . '></td></tr>';
return $retval;
***************
*** 278,286 ****
$post_url = $_CONF['site_url'] . '/users.php';
$postmode = 'create';
! $submitbutton = '<input type="submit" value="Register Now!">';
$message = "<blockquote style=\"padding-top:10px;\"><b>Please complete the application below. Once you have completed the application, click the Register Now! button and the application will be processed immediately.</b></blockquote>";
$user_templates = new Template ($_CONF['path_layout'] . 'custom');
$user_templates->set_file('memberdetail', 'memberdetail.thtml');
$user_templates->set_var('site_url', $_CONF['site_url']);
$user_templates->set_var('layout_url', $_CONF['layout_url']);
--- 278,287 ----
$post_url = $_CONF['site_url'] . '/users.php';
$postmode = 'create';
! $submitbutton = '<input type="submit" value="Register Now!"' . XHTML . '>';
$message = "<blockquote style=\"padding-top:10px;\"><b>Please complete the application below. Once you have completed the application, click the Register Now! button and the application will be processed immediately.</b></blockquote>";
$user_templates = new Template ($_CONF['path_layout'] . 'custom');
$user_templates->set_file('memberdetail', 'memberdetail.thtml');
+ $user_templates->set_var( 'xhtml', XHTML );
$user_templates->set_var('site_url', $_CONF['site_url']);
$user_templates->set_var('layout_url', $_CONF['layout_url']);
Index: lib-user.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/lib-user.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** lib-user.php 9 Jun 2007 21:27:57 -0000 1.43
--- lib-user.php 25 Nov 2007 06:55:07 -0000 1.44
***************
*** 153,156 ****
--- 153,157 ----
$template = new Template ($_CONF['path_data']);
$template->set_file (array ('mail' => 'welcome_email.txt'));
+ $template->set_var ( 'xhtml', XHTML );
$template->set_var ('auth_info',
"$LANG04[2]: $username\n$LANG04[4]: $passwd");
***************
*** 202,205 ****
--- 203,207 ----
$template = new Template ($_CONF['path_data']);
$template->set_file (array ('mail' => 'activation_email.txt'));
+ $template->set_var ( 'xhtml', XHTML );
$template->set_var ('site_url', $_CONF['site_url']);
$template->set_var ('site_name', $_CONF['site_name']);
***************
*** 362,366 ****
} else {
// user has been created, or has activated themselves:
! $mailbody .= "$LANG29[4] <{$_CONF['site_url']}/users.php?mode=profile&uid={$uid}>\n\n";
}
$mailbody .= "\n------------------------------\n";
--- 364,368 ----
} else {
// user has been created, or has activated themselves:
! $mailbody .= "$LANG29[4] <{$_CONF['site_url']}/users.php?mode=profile&uid={$uid}>\n\n";
}
$mailbody .= "\n------------------------------\n";
***************
*** 457,461 ****
$userphoto .= ' width="' . $width . '"';
}
! $userphoto .= ' alt="" class="userphoto">';
}
}
--- 459,463 ----
$userphoto .= ' width="' . $width . '"';
}
! $userphoto .= ' alt="" class="userphoto"' . XHTML . '>';
}
}
Index: lib-story.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/lib-story.php,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** lib-story.php 24 Nov 2007 12:42:57 -0000 1.113
--- lib-story.php 25 Nov 2007 06:55:07 -0000 1.114
***************
*** 94,97 ****
--- 94,98 ----
));
+ $article->set_var( 'xhtml', XHTML );
$article->set_var( 'layout_url', $_CONF['layout_url'] );
$article->set_var( 'site_url', $_CONF['site_url'] );
***************
*** 138,142 ****
$article->set_var( 'contributedby_photo', $photo );
$camera_icon = '<img src="' . $_CONF['layout_url']
! .'/images/smallcamera.' . $_IMAGE_TYPE . '" alt="">';
$article->set_var( 'camera_icon', COM_createLink($camera_icon, $profileUrl));
}
--- 139,143 ----
$article->set_var( 'contributedby_photo', $photo );
$camera_icon = '<img src="' . $_CONF['layout_url']
! .'/images/smallcamera.' . $_IMAGE_TYPE . '" alt=""' . XHTML . '>';
$article->set_var( 'camera_icon', COM_createLink($camera_icon, $profileUrl));
}
***************
*** 163,167 ****
$topicimage = '<img src="' . $imageurl . '" class="float'
. $_CONF['article_image_align'] . '" alt="'
! . $topicname . '" title="' . $topicname . '">';
$article->set_var( 'story_anchortag_and_image',
COM_createLink(
--- 164,168 ----
$topicimage = '<img src="' . $imageurl . '" class="float'
. $_CONF['article_image_align'] . '" alt="'
! . $topicname . '" title="' . $topicname . '"' . XHTML . '>';
$article->set_var( 'story_anchortag_and_image',
COM_createLink(
***************
*** 173,177 ****
$article->set_var( 'story_topic_image', $topicimage );
$topicimage_noalign = '<img src="' . $imageurl . '" alt="'
! . $topicname . '" title="' . $topicname . '">';
$article->set_var( 'story_anchortag_and_image_no_align',
COM_createLink(
--- 174,178 ----
$article->set_var( 'story_topic_image', $topicimage );
$topicimage_noalign = '<img src="' . $imageurl . '" alt="'
! . $topicname . '" title="' . $topicname . '"' . XHTML . '>';
$article->set_var( 'story_anchortag_and_image_no_align',
COM_createLink(
***************
*** 247,251 ****
}
! $article->set_var( 'story_introtext', $introtext . '<br><br>'
. $bodytext );
$article->set_var( 'story_text_no_br', $introtext . $bodytext );
--- 248,252 ----
}
! $article->set_var( 'story_introtext', $introtext . '<br' . XHTML . '><br' . XHTML . '>'
. $bodytext );
$article->set_var( 'story_text_no_br', $introtext . $bodytext );
***************
*** 264,268 ****
$pingico = '<img src="' . $_CONF['layout_url'] . '/images/sendping.'
. $_IMAGE_TYPE . '" alt="' . $LANG_TRB['send_trackback']
! . '" title="' . $LANG_TRB['send_trackback'] . '">';
$article->set_var( 'send_trackback_icon',
COM_createLink($pingico, $url)
--- 265,269 ----
$pingico = '<img src="' . $_CONF['layout_url'] . '/images/sendping.'
. $_IMAGE_TYPE . '" alt="' . $LANG_TRB['send_trackback']
! . '" title="' . $LANG_TRB['send_trackback'] . '"' . XHTML . '>';
$article->set_var( 'send_trackback_icon',
COM_createLink($pingico, $url)
***************
*** 383,387 ****
$pingico = '<img src="' . $_CONF['layout_url'] . '/images/sendping.'
. $_IMAGE_TYPE . '" alt="' . $LANG_TRB['send_trackback']
! . '" title="' . $LANG_TRB['send_trackback'] . '">';
$article->set_var( 'send_trackback_icon',
COM_createLink($pingico, $pingurl)
--- 384,388 ----
$pingico = '<img src="' . $_CONF['layout_url'] . '/images/sendping.'
. $_IMAGE_TYPE . '" alt="' . $LANG_TRB['send_trackback']
! . '" title="' . $LANG_TRB['send_trackback'] . '"' . XHTML . '>';
$article->set_var( 'send_trackback_icon',
COM_createLink($pingico, $pingurl)
***************
*** 419,423 ****
$emailicon = '<img src="' . $_CONF['layout_url'] . '/images/mail.'
. $_IMAGE_TYPE . '" alt="' . $LANG01[64] . '" title="'
! . $LANG11[2] . '">';
$article->set_var( 'email_icon',
COM_createLink($emailicon, $emailUrl)
--- 420,424 ----
$emailicon = '<img src="' . $_CONF['layout_url'] . '/images/mail.'
. $_IMAGE_TYPE . '" alt="' . $LANG01[64] . '" title="'
! . $LANG11[2] . '"' . XHTML . '>';
$article->set_var( 'email_icon',
COM_createLink($emailicon, $emailUrl)
***************
*** 437,441 ****
$printicon = '<img src="' . $_CONF['layout_url']
. '/images/print.' . $_IMAGE_TYPE . '" alt="' . $LANG01[65]
! . '" title="' . $LANG11[3] . '">';
$article->set_var( 'print_icon',
COM_createLink($printicon, $printUrl, array('rel' => 'nofollow'))
--- 438,442 ----
$printicon = '<img src="' . $_CONF['layout_url']
. '/images/print.' . $_IMAGE_TYPE . '" alt="' . $LANG01[65]
! . '" title="' . $LANG11[3] . '"' . XHTML . '>';
$article->set_var( 'print_icon',
COM_createLink($printicon, $printUrl, array('rel' => 'nofollow'))
***************
*** 451,455 ****
$pdficon = '<img src="'. $_CONF['layout_url'] . '/images/pdf.'
. $_IMAGE_TYPE . '" alt="'. $LANG01[111]
! .'" title="'. $LANG11[5] .'">';
$article->set_var( 'pdf_icon',
COM_createLink($pdficon, $pdfUrl)
--- 452,456 ----
$pdficon = '<img src="'. $_CONF['layout_url'] . '/images/pdf.'
. $_IMAGE_TYPE . '" alt="'. $LANG01[111]
! .'" title="'. $LANG11[5] .'"' . XHTML . '>';
$article->set_var( 'pdf_icon',
COM_createLink($pdficon, $pdfUrl)
***************
*** 481,485 ****
$article->set_var( 'lang_edit_text', $LANG01[4] );
$editicon = $_CONF['layout_url'] . '/images/edit.' . $_IMAGE_TYPE;
! $editiconhtml = '<img src="' . $editicon . '" alt="' . $LANG01[4] . '" title="' . $LANG01[4] . '">';
$article->set_var( 'edit_icon',
COM_createLink(
--- 482,486 ----
$article->set_var( 'lang_edit_text', $LANG01[4] );
$editicon = $_CONF['layout_url'] . '/images/edit.' . $_IMAGE_TYPE;
! $editiconhtml = '<img src="' . $editicon . '" alt="' . $LANG01[4] . '" title="' . $LANG01[4] . '"' . XHTML . '>';
$article->set_var( 'edit_icon',
COM_createLink(
***************
*** 816,822 ****
. '/getimage.php?mode=articles&image=' . $A['ai_filename'];
}
! $norm = $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt="">' . $lLinkSuffix;
! $left = $lLinkPrefix . '<img ' . $sizeattributes . 'class="alignleft" src="' . $imgSrc . '" alt="">' . $lLinkSuffix;
! $right = $lLinkPrefix . '<img ' . $sizeattributes . 'class="alignright" src="' . $imgSrc . '" alt="">' . $lLinkSuffix;
$fulltext = $intro . ' ' . $body;
--- 817,823 ----
. '/getimage.php?mode=articles&image=' . $A['ai_filename'];
}
! $norm = $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt=""' . XHTML . '>' . $lLinkSuffix;
! $left = $lLinkPrefix . '<img ' . $sizeattributes . 'class="alignleft" src="' . $imgSrc . '" alt=""' . XHTML . '>' . $lLinkSuffix;
! $right = $lLinkPrefix . '<img ' . $sizeattributes . 'class="alignright" src="' . $imgSrc . '" alt=""' . XHTML . '>' . $lLinkSuffix;
$fulltext = $intro . ' ' . $body;
***************
*** 837,843 ****
if (file_exists ($lFilename_large_complete)) {
$sizeattributes = COM_getImgSizeAttributes($lFilename_large_complete);
! $norm = '<img ' . $sizeattributes . 'src="' . $lFilename_large_URL . '" alt="">';
! $left = '<img ' . $sizeattributes . 'align="left" src="' . $lFilename_large_URL . '" alt="">';
! $right = '<img ' . $sizeattributes . 'align="right" src="' . $lFilename_large_URL . '" alt="">';
}
$intro = str_replace ($norm, $unscaledX, $intro);
--- 838,844 ----
if (file_exists ($lFilename_large_complete)) {
$sizeattributes = COM_getImgSizeAttributes($lFilename_large_complete);
! $norm = '<img ' . $sizeattributes . 'src="' . $lFilename_large_URL . '" alt=""' . XHTML . '>';
! $left = '<img ' . $sizeattributes . 'align="left" src="' . $lFilename_large_URL . '" alt=""' . XHTML . '>';
! $right = '<img ' . $sizeattributes . 'align="right" src="' . $lFilename_large_URL . '" alt=""' . XHTML . '>';
}
$intro = str_replace ($norm, $unscaledX, $intro);
***************
*** 930,939 ****
$imgSrc = $_CONF['site_url'] . '/getimage.php?mode=articles&image=' . $A['ai_filename'];
}
! $intro = str_replace($norm, $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt="">' . $lLinkSuffix, $intro);
! $body = str_replace($norm, $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt="">' . $lLinkSuffix, $body);
! $intro = str_replace($left, $lLinkPrefix . '<img ' . $sizeattributes . 'align="left" src="' . $imgSrc . '" alt="">' . $lLinkSuffix, $intro);
! $body = str_replace($left, $lLinkPrefix . '<img ' . $sizeattributes . 'align="left" src="' . $imgSrc . '" alt="">' . $lLinkSuffix, $body);
! $intro = str_replace($right, $lLinkPrefix . '<img ' . $sizeattributes . 'align="right" src="' . $imgSrc . '" alt="">' . $lLinkSuffix, $intro);
! $body = str_replace($right, $lLinkPrefix . '<img ' . $sizeattributes . 'align="right" src="' . $imgSrc . '" alt="">' . $lLinkSuffix, $body);
if (($_CONF['allow_user_scaling'] == 1) and
--- 931,940 ----
$imgSrc = $_CONF['site_url'] . '/getimage.php?mode=articles&image=' . $A['ai_filename'];
}
! $intro = str_replace($norm, $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt=""' . XHTML . '>' . $lLinkSuffix, $intro);
! $body = str_replace($norm, $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt=""' . XHTML . '>' . $lLinkSuffix, $body);
! $intro = str_replace($left, $lLinkPrefix . '<img ' . $sizeattributes . 'align="left" src="' . $imgSrc . '" alt=""' . XHTML . '>' . $lLinkSuffix, $intro);
! $body = str_replace($left, $lLinkPrefix . '<img ' . $sizeattributes . 'align="left" src="' . $imgSrc . '" alt=""' . XHTML . '>' . $lLinkSuffix, $body);
! $intro = str_replace($right, $lLinkPrefix . '<img ' . $sizeattributes . 'align="right" src="' . $imgSrc . '" alt=""' . XHTML . '>' . $lLinkSuffix, $intro);
! $body = str_replace($right, $lLinkPrefix . '<img ' . $sizeattributes . 'align="right" src="' . $imgSrc . '" alt=""' . XHTML . '>' . $lLinkSuffix, $body);
if (($_CONF['allow_user_scaling'] == 1) and
***************
*** 944,953 ****
$sizeattributes = COM_getImgSizeAttributes ($lFilename_large_complete);
}
! $intro = str_replace($unscalednorm, '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt="">', $intro);
! $body = str_replace($unscalednorm, '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt="">', $body);
! $intro = str_replace($unscaledleft, '<img ' . $sizeattributes . 'align="left" src="' . $imgSrc . '" alt="">', $intro);
! $body = str_replace($unscaledleft, '<img ' . $sizeattributes . 'align="left" src="' . $imgSrc . '" alt="">', $body);
! $intro = str_replace($unscaledright, '<img ' . $sizeattributes . 'align="right" src="' . $imgSrc . '" alt="">', $intro);
! $body = str_replace($unscaledright, '<img ' . $sizeattributes . 'align="right" src="' . $imgSrc . '" alt="">', $body);
}
--- 945,954 ----
$sizeattributes = COM_getImgSizeAttributes ($lFilename_large_complete);
}
! $intro = str_replace($unscalednorm, '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt=""' . XHTML . '>', $intro);
! $body = str_replace($unscalednorm, '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt=""' . XHTML . '>', $body);
! $intro = str_replace($unscaledleft, '<img ' . $sizeattributes . 'align="left" src="' . $imgSrc . '" alt=""' . XHTML . '>', $intro);
! $body = str_replace($unscaledleft, '<img ' . $sizeattributes . 'align="left" src="' . $imgSrc . '" alt=""' . XHTML . '>', $body);
! $intro = str_replace($unscaledright, '<img ' . $sizeattributes . 'align="right" src="' . $imgSrc . '" alt=""' . XHTML . '>', $intro);
! $body = str_replace($unscaledright, '<img ' . $sizeattributes . 'align="right" src="' . $imgSrc . '" alt=""' . XHTML . '>', $body);
}
***************
*** 1321,1325 ****
$output .= $LANG24[55] . '<p>';
for ($i = 1; $i <= count($errors); $i++) {
! $output .= current($errors) . '<br>';
next($errors);
}
--- 1322,1326 ----
$output .= $LANG24[55] . '<p>';
for ($i = 1; $i <= count($errors); $i++) {
! $output .= current($errors) . '<br' . XHTML . '>';
next($errors);
}
Index: lib-admin.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/lib-admin.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** lib-admin.php 10 Oct 2007 02:32:49 -0000 1.123
--- lib-admin.php 25 Nov 2007 06:55:07 -0000 1.124
***************
*** 82,85 ****
--- 82,86 ----
)
);
+ $admin_templates->set_var( 'xhtml', XHTML );
$admin_templates->set_var('site_url', $_CONF['site_url']);
$admin_templates->set_var('layout_url', $_CONF['layout_url']);
***************
*** 109,113 ****
}
if (count($data_arr) > $min_data AND is_array($options) AND $options['chkdelete']) {
! $admin_templates->set_var('header_text', '<input type="checkbox" name="chk_selectall" title="'.$LANG01[126].'" onclick="caItems(this.form);">');
$admin_templates->set_var('class', "admin-list-field");
$admin_templates->set_var('show_deleteimage', '');
--- 110,114 ----
}
if (count($data_arr) > $min_data AND is_array($options) AND $options['chkdelete']) {
! $admin_templates->set_var('header_text', '<input type="checkbox" name="chk_selectall" title="'.$LANG01[126].'" onclick="caItems(this.form);"' . XHTML . '>');
$admin_templates->set_var('class', "admin-list-field");
$admin_templates->set_var('show_deleteimage', '');
***************
*** 142,146 ****
for ($i = 0; $i < count($data_arr); $i++) {
if (count($data_arr) > $min_data AND is_array($options) AND $options['chkdelete']) {
! $admin_templates->set_var('itemtext', '<input type="checkbox" name="delitem[]" value="' . $data_arr[$i][$options['chkfield']].'">');
$admin_templates->set_var('class', "admin-list-field");
$admin_templates->parse('item_field', 'field', true);
--- 143,147 ----
for ($i = 0; $i < count($data_arr); $i++) {
if (count($data_arr) > $min_data AND is_array($options) AND $options['chkdelete']) {
! $admin_templates->set_var('itemtext', '<input type="checkbox" name="delitem[]" value="' . $data_arr[$i][$options['chkfield']].'"' . XHTML . '>');
$admin_templates->set_var('class', "admin-list-field");
$admin_templates->parse('item_field', 'field', true);
***************
*** 270,273 ****
--- 271,275 ----
# insert std. values into the template
+ $admin_templates->set_var( 'xhtml', XHTML );
$admin_templates->set_var('site_url', $_CONF['site_url']);
$admin_templates->set_var('layout_url', $_CONF['layout_url']);
***************
*** 284,288 ****
// Check if the delete checkbox and support for the delete all feature should be displayed
if (is_array($options) AND $options['chkdelete']) {
! $admin_templates->set_var('header_text', '<input type="checkbox" name="chk_selectall" title="'.$LANG01[126].'" onclick="caItems(this.form);">');
$admin_templates->set_var('class', "admin-list-field");
$admin_templates->set_var('show_deleteimage', '');
--- 286,290 ----
// Check if the delete checkbox and support for the delete all feature should be displayed
if (is_array($options) AND $options['chkdelete']) {
! $admin_templates->set_var('header_text', '<input type="checkbox" name="chk_selectall" title="'.$LANG01[126].'" onclick="caItems(this.form);"' . XHTML . '>');
$admin_templates->set_var('class', "admin-list-field");
$admin_templates->set_var('show_deleteimage', '');
***************
*** 377,381 ****
}
# make the mouseover effect is sortable
! $th_subtags = " OnMouseOver=\"this.style.cursor='pointer';\"";
$order_var = $i; # assign number to field so we know what to sort
if (strpos ($form_url, '?') > 0) {
--- 379,383 ----
}
# make the mouseover effect is sortable
! $th_subtags = " onmouseover=\"this.style.cursor='pointer';\"";
$order_var = $i; # assign number to field so we know what to sort
if (strpos ($form_url, '?') > 0) {
***************
*** 467,471 ****
if (is_array($options) AND $options['chkdelete']) {
$admin_templates->set_var('class', "admin-list-field");
! $admin_templates->set_var('itemtext', '<input type="checkbox" name="delitem[]" value="' . $A[$options['chkfield']].'">');
$admin_templates->parse('item_field', 'field', true);
}
--- 469,473 ----
if (is_array($options) AND $options['chkdelete']) {
$admin_templates->set_var('class', "admin-list-field");
! $admin_templates->set_var('itemtext', '<input type="checkbox" name="delitem[]" value="' . $A[$options['chkfield']].'"' . XHTML . '>');
$admin_templates->parse('item_field', 'field', true);
}
***************
*** 576,579 ****
--- 578,582 ----
$admin_templates->set_var('menu_fields', $menu_fields);
$admin_templates->set_var('lang_instructions', $text);
+ $admin_templates->set_var( 'xhtml', XHTML );
$admin_templates->parse('top_menu', 'top_menu');
$retval = $admin_templates->finish($admin_templates->get_var('top_menu'));
***************
*** 614,618 ****
}
$retval = "<input type=\"checkbox\" name=\"enabledblocks[{$A['bid']}]\" "
! . "onclick=\"submit()\" value=\"{$A['onleft']}\"$switch>";
}
break;
--- 617,621 ----
}
$retval = "<input type=\"checkbox\" name=\"enabledblocks[{$A['bid']}]\" "
! . "onclick=\"submit()\" value=\"{$A['onleft']}\"$switch" . XHTML . ">";
}
break;
***************
*** 629,637 ****
$switchside = '0';
}
! $retval.="<img src=\"{$_CONF['layout_url']}/images/admin/$blockcontrol_image\" width=\"45\" height=\"20\" usemap=\"#arrow{$A['bid']}\" alt=\"\">"
! ."<map name=\"arrow{$A['bid']}\">"
! ."<area coords=\"0,0,12,20\" title=\"{$LANG21[58]}\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&bid={$A['bid']}&where=up\" alt=\"{$LANG21[58]}\">"
! ."<area coords=\"13,0,29,20\" title=\"$moveTitleMsg\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&bid={$A['bid']}&where=$switchside\" alt=\"$moveTitleMsg\">"
! ."<area coords=\"30,0,43,20\" title=\"{$LANG21[57]}\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&bid={$A['bid']}&where=dn\" alt=\"{$LANG21[57]}\">"
."</map>";
}
--- 632,640 ----
$switchside = '0';
}
! $retval.="<img src=\"{$_CONF['layout_url']}/images/admin/$blockcontrol_image\" width=\"45\" height=\"20\" usemap=\"#arrow{$A['bid']}\" alt=\"\"" . XHTML . ">"
! ."<map id=\"arrow{$A['bid']}\" name=\"arrow{$A['bid']}\">"
! ."<area coords=\"0,0,12,20\" title=\"{$LANG21[58]}\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&bid={$A['bid']}&where=up\" alt=\"{$LANG21[58]}\"" . XHTML . ">"
! ."<area coords=\"13,0,29,20\" title=\"$moveTitleMsg\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&bid={$A['bid']}&where=$switchside\" alt=\"$moveTitleMsg\"" . XHTML . ">"
! ."<area coords=\"30,0,43,20\" title=\"{$LANG21[57]}\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&bid={$A['bid']}&where=dn\" alt=\"{$LANG21[57]}\"" . XHTML . ">"
."</map>";
}
***************
*** 718,722 ****
switch ($fieldname) {
case 'delete':
! $retval = '<input type="checkbox" name="delitem[]" checked="checked">';
break;
case 'edit':
--- 721,725 ----
switch ($fieldname) {
case 'delete':
! $retval = '<input type="checkbox" name="delitem[]" checked="checked"' . XHTML . '>';
break;
case 'edit':
***************
*** 728,732 ****
if (!empty ($A['photo'])) {
$photoico = " <img src=\"{$_CONF['layout_url']}/images/smallcamera."
! . $_IMAGE_TYPE . '" alt="{$LANG04[77]}">';
} else {
$photoico = '';
--- 731,735 ----
if (!empty ($A['photo'])) {
$photoico = " <img src=\"{$_CONF['layout_url']}/images/smallcamera."
! . $_IMAGE_TYPE . '" alt="{$LANG04[77]}"' . XHTML . '>';
} else {
$photoico = '';
***************
*** 855,859 ****
$pingico = '<img src="' . $_CONF['layout_url'] . '/images/sendping.'
. $_IMAGE_TYPE . '" alt="' . $LANG24[21] . '" title="'
! . $LANG24[21] . '">';
if (($A['draft_flag'] == 0) && ($A['unixdate'] < time())) {
$url = $_CONF['site_admin_url']
--- 858,862 ----
$pingico = '<img src="' . $_CONF['layout_url'] . '/images/sendping.'
. $_IMAGE_TYPE . '" alt="' . $LANG24[21] . '" title="'
! . $LANG24[21] . '"' . XHTML . '>';
if (($A['draft_flag'] == 0) && ($A['unixdate'] < time())) {
$url = $_CONF['site_admin_url']
***************
*** 908,912 ****
}
$retval = "<input type=\"checkbox\" name=\"enabledfeeds[]\" "
! . "onclick=\"submit()\" value=\"{$A['fid']}\"$switch>";
break;
case 'header_tid':
--- 911,915 ----
}
$retval = "<input type=\"checkbox\" name=\"enabledfeeds[]\" "
! . "onclick=\"submit()\" value=\"{$A['fid']}\"$switch" . XHTML . ">";
break;
case 'header_tid':
***************
*** 965,969 ****
}
$retval = "<input type=\"checkbox\" name=\"enabledplugins[{$A['pi_name']}]\" "
! . "onclick=\"submit()\" value=\"1\"$switch>";
break;
default:
--- 968,972 ----
}
$retval = "<input type=\"checkbox\" name=\"enabledplugins[{$A['pi_name']}]\" "
! . "onclick=\"submit()\" value=\"1\"$switch" . XHTML . ">";
break;
default:
***************
*** 989,997 ****
break;
case 'delete':
! $retval = "<input type=\"radio\" name=\"action[{$A['row']}]\" value=\"delete\">";
break;
case 'approve':
! $retval = "<input type=\"radio\" name=\"action[{$A['row']}]\" value=\"approve\">"
! ."<input type=\"hidden\" name=\"id[{$A['row']}]\" value=\"{$A[0]}\">";
break;
case 'day':
--- 992,1000 ----
break;
case 'delete':
! $retval = "<input type=\"radio\" name=\"action[{$A['row']}]\" value=\"delete\"" . XHTML . ">";
break;
case 'approve':
! $retval = "<input type=\"radio\" name=\"action[{$A['row']}]\" value=\"approve\"" . XHTML . ">"
! ."<input type=\"hidden\" name=\"id[{$A['row']}]\" value=\"{$A[0]}\"" . XHTML . ">";
break;
case 'day':
***************
*** 1045,1049 ****
}
$retval = "<input type=\"checkbox\" name=\"changedservices[]\" "
! . "onclick=\"submit()\" value=\"{$A['pid']}\"$switch>";
break;
default:
--- 1048,1052 ----
}
$retval = "<input type=\"checkbox\" name=\"changedservices[]\" "
! . "onclick=\"submit()\" value=\"{$A['pid']}\"$switch" . XHTML . ">";
break;
default:
Index: lib-trackback.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/lib-trackback.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** lib-trackback.php 2 Sep 2007 07:50:56 -0000 1.49
--- lib-trackback.php 25 Nov 2007 06:55:07 -0000 1.50
***************
*** 364,367 ****
--- 364,368 ----
$template = new Template ($_CONF['path_layout'] . 'trackback');
$template->set_file (array ('comment' => 'formattedcomment.thtml'));
+ $template->set_var ( 'xhtml', XHTML );
$template->set_var ('site_url', $_CONF['site_url']);
$template->set_var ('layout_url', $_CONF['layout_url']);
***************
*** 397,401 ****
$template->set_var ('trackback_excerpt_readmore',
$excerpt . ' ' . $readmore);
! $template->set_var ('excerpt_br', '<br>');
}
--- 398,402 ----
$template->set_var ('trackback_excerpt_readmore',
$excerpt . ' ' . $readmore);
! $template->set_var ('excerpt_br', '<br' . XHTML . '>');
}
***************
*** 684,687 ****
--- 685,689 ----
$template->set_file (array ('trackback' => 'trackback.thtml',
'comment' => 'trackbackcomment.thtml'));
+ $template->set_var ( 'xhtml', XHTML );
$template->set_var ('site_url', $_CONF['site_url']);
$template->set_var ('layout_url', $_CONF['layout_url']);
***************
*** 767,772 ****
}
! $toSend = 'url=' . rawurlencode ($url) . '&title=' . rawurlencode ($title)
! . '&blog_name=' . rawurlencode ($blog) . '&excerpt='
. rawurlencode ($excerpt);
$charset = COM_getCharset ();
--- 769,774 ----
}
! $toSend = 'url=' . rawurlencode ($url) . '&title=' . rawurlencode ($title)
! . '&blog_name=' . rawurlencode ($blog) . '&excerpt='
. rawurlencode ($excerpt);
$charset = COM_getCharset ();
***************
*** 931,935 ****
} else {
$mailsubject = $_CONF['site_name'] . ' ' . $LANG_TRB['trackback'];
! $mailbody .= "\n" . $LANG_TRB['delete_trackback'] . "<" . $_CONF['site_admin_url'] . '/trackback.php?mode=delete&cid=' . $cid . ">\n";
}
--- 933,937 ----
} else {
$mailsubject = $_CONF['site_name'] . ' ' . $LANG_TRB['trackback'];
! $mailbody .= "\n" . $LANG_TRB['delete_trackback'] . "<" . $_CONF['site_admin_url'] . '/trackback.php?mode=delete&cid=' . $cid . ">\n";
}
Index: lib-plugins.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/lib-plugins.php,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** lib-plugins.php 24 Nov 2007 12:42:57 -0000 1.136
--- lib-plugins.php 25 Nov 2007 06:55:07 -0000 1.137
***************
*** 1704,1708 ****
$function = 'custom_getfeedcontent';
if (function_exists($function)) {
! $content = $function($feed, $link, $update_date, $feedType, $feedVersion);
}
} else {
--- 1704,1708 ----
$function = 'custom_getfeedcontent';
if (function_exists($function)) {
! $content = $function($feed, $link, $update_data, $feedType, $feedVersion);
}
} else {
Index: lib-comment.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/lib-comment.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** lib-comment.php 13 Aug 2007 01:27:34 -0000 1.59
--- lib-comment.php 25 Nov 2007 06:55:07 -0000 1.60
***************
*** 73,76 ****
--- 73,77 ----
$commentbar = new Template( $_CONF['path_layout'] . 'comment' );
$commentbar->set_file( array( 'commentbar' => 'commentbar.thtml' ));
+ $commentbar->set_var( 'xhtml', XHTML );
$commentbar->set_var( 'site_url', $_CONF['site_url'] );
$commentbar->set_var( 'layout_url', $_CONF['layout_url'] );
***************
*** 105,110 ****
)
);
! $commentbar->set_var( 'start_storylink_anchortag', '<a·href="'
! . $articleUrl . '"·class="non-ul">' );
$commentbar->set_var( 'end_storylink_anchortag', '</a>' );
}
--- 106,111 ----
)
);
! $commentbar->set_var( 'start_storylink_anchortag', '<a href="'
! . $articleUrl . '" class="non-ul">' );
$commentbar->set_var( 'end_storylink_anchortag', '</a>' );
}
***************
*** 149,165 ****
$hidden = '';
if( $_REQUEST['mode'] == 'view' ) {
! $hidden .= '<input type="hidden" name="cid" value="' . $_REQUEST['cid'] . '">';
! $hidden .= '<input type="hidden" name="pid" value="' . $_REQUEST['cid'] . '">';
}
else if( $_REQUEST['mode'] == 'display' ) {
! $hidden .= '<input type="hidden" name="pid" value="' . $_REQUEST['pid'] . '">';
}
$commentbar->set_var( 'hidden_field', $hidden .
! '<input type="hidden" name="mode" value="' . $_REQUEST['mode'] . '">' );
} else if( $type == 'article' ) {
$commentbar->set_var( 'parent_url',
$_CONF['site_url'] . '/article.php' );
$commentbar->set_var( 'hidden_field',
! '<input type="hidden" name="story" value="' . $sid . '">' );
} else { // plugin
// Link to plugin defined link or lacking that a generic link that the plugin should support (hopefully)
--- 150,166 ----
$hidden = '';
if( $_REQUEST['mode'] == 'view' ) {
! $hidden .= '<input type="hidden" name="cid" value="' . $_REQUEST['cid'] . '"' . XHTML . '>';
! $hidden .= '<input type="hidden" name="pid" value="' . $_REQUEST['cid'] . '"' . XHTML . '>';
}
else if( $_REQUEST['mode'] == 'display' ) {
! $hidden .= '<input type="hidden" name="pid" value="' . $_REQUEST['pid'] . '"' . XHTML . '>';
}
$commentbar->set_var( 'hidden_field', $hidden .
! '<input type="hidden" name="mode" value="' . $_REQUEST['mode'] . '"' . XHTML . '>' );
} else if( $type == 'article' ) {
$commentbar->set_var( 'parent_url',
$_CONF['site_url'] . '/article.php' );
$commentbar->set_var( 'hidden_field',
! '<input type="hidden" name="story" value="' . $sid . '"' . XHTML . '>' );
} else { // plugin
// Link to plugin defined link or lacking that a generic link that the plugin should support (hopefully)
***************
*** 167,171 ****
$commentbar->set_var( 'parent_url', $plgurl );
$commentbar->set_var( 'hidden_field',
! '<input type="hidden" name="' . $plgid . '" value="' . $sid . '">' );
}
--- 168,172 ----
$commentbar->set_var( 'parent_url', $plgurl );
$commentbar->set_var( 'hidden_field',
! '<input type="hidden" name="' . $plgid . '" value="' . $sid . '"' . XHTML . '>' );
}
***************
*** 218,221 ****
--- 219,223 ----
// generic template variables
+ $template->set_var( 'xhtml', XHTML );
$template->set_var( 'site_url', $_CONF['site_url'] );
$template->set_var( 'layout_url', $_CONF['layout_url'] );
***************
*** 293,297 ****
$template->set_var( 'author_photo', $photo );
$camera_icon = '<img src="' . $_CONF['layout_url']
! . '/images/smallcamera.' . $_IMAGE_TYPE . '" alt="">';
$template->set_var( 'camera_icon',
COM_createLink(
--- 295,299 ----
$template->set_var( 'author_photo', $photo );
$camera_icon = '<img src="' . $_CONF['layout_url']
! . '/images/smallcamera.' . $_IMAGE_TYPE . '" alt=""' . XHTML . '>';
$template->set_var( 'camera_icon',
COM_createLink(
***************
*** 498,501 ****
--- 500,504 ----
$template = new Template( $_CONF['path_layout'] . 'comment' );
$template->set_file( array( 'commentarea' => 'startcomment.thtml' ));
+ $template->set_var( 'xhtml', XHTML );
$template->set_var( 'site_url', $_CONF['site_url'] );
$template->set_var( 'layout_url', $_CONF['layout_url'] );
***************
*** 637,640 ****
--- 640,644 ----
$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']);
***************
*** 701,705 ****
if (!empty ($sig)) {
if (($postmode == 'html') || ($fakepostmode == 'html')) {
! $newcomment .= '<p>---<br>' . nl2br ($sig);
} else {
$newcomment .= LB . LB . '---' . LB . $sig;
--- 705,709 ----
if (!empty ($sig)) {
if (($postmode == 'html') || ($fakepostmode == 'html')) {
! $newcomment .= '<p>---<br' . XHTML . '>' . nl2br ($sig);
} else {
$newcomment .= LB . LB . '---' . LB . $sig;
***************
*** 712,715 ****
--- 716,720 ----
$start = new Template( $_CONF['path_layout'] . 'comment' );
$start->set_file( array( 'comment' => 'startcomment.thtml' ));
+ $start->set_var( 'xhtml', XHTML );
$start->set_var( 'site_url', $_CONF['site_url'] );
$start->set_var( 'layout_url', $_CONF['layout_url'] );
***************
*** 754,757 ****
--- 759,763 ----
$comment_template->set_file('form','commentform.thtml');
}
+ $comment_template->set_var( 'xhtml', XHTML );
$comment_template->set_var('site_url', $_CONF['site_url']);
$comment_template->set_var('start_block_postacomment', COM_startBlock($LANG03[1]));
***************
*** 798,802 ****
if (($_CONF['skip_preview'] == 1) || ($mode == $LANG03[14])) {
PLG_templateSetVars ('comment', $comment_template);
! $comment_template->set_var('save_option', '<input type="submit" name="mode" value="' . $LANG03[11] . '">');
}
--- 804,808 ----
if (($_CONF['skip_preview'] == 1) || ($mode == $LANG03[14])) {
PLG_templateSetVars ('comment', $comment_template);
! $comment_template->set_var('save_option', '<input type="submit" name="mode" value="' . $LANG03[11] . '"' . XHTML . '>');
}
***************
*** 897,901 ****
if (!empty ($sig)) {
if ($postmode == 'html') {
! $comment .= '<p>---<br>' . nl2br($sig);
} else {
$comment .= LB . LB . '---' . LB . $sig;
--- 903,907 ----
if (!empty ($sig)) {
if ($postmode == 'html') {
! $comment .= '<p>---<br' . XHTML . '>' . nl2br($sig);
} else {
$comment .= LB . LB . '---' . LB . $sig;
***************
*** 1004,1008 ****
$mailbody .= $LANG08[33] . ' <' . $_CONF['site_url']
! . '/comment.php?mode=view&cid=' . $cid . ">\n\n";
$mailbody .= "\n------------------------------\n";
--- 1010,1014 ----
$mailbody .= $LANG08[33] . ' <' . $_CONF['site_url']
! . '/comment.php?mode=view&cid=' . $cid . ">\n\n";
$mailbody .= "\n------------------------------\n";
***************
*** 1090,1093 ****
--- 1096,1100 ----
$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']);
***************
*** 1114,1117 ****
--- 1121,1125 ----
$start = new Template ($_CONF['path_layout'] . 'comment');
$start->set_file (array ('report' => 'reportcomment.thtml'));
+ $start->set_var ( 'xhtml', XHTML );
$start->set_var ('site_url', $_CONF['site_url']);
$start->set_var ('layout_url', $_CONF['layout_url']);
***************
*** 1163,1166 ****
--- 1171,1175 ----
$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']);
***************
*** 1217,1221 ****
$mailbody .= $LANG08[33] . ' <' . $_CONF['site_url']
! . '/comment.php?mode=view&cid=' . $cid . ">\n\n";
$mailbody .= "\n------------------------------\n";
--- 1226,1230 ----
$mailbody .= $LANG08[33] . ' <' . $_CONF['site_url']
! . '/comment.php?mode=view&cid=' . $cid . ">\n\n";
$mailbody .= "\n------------------------------\n";
Index: lib-custom.php.dist
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/lib-custom.php.dist,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lib-custom.php.dist 16 Mar 2007 14:22:52 -0000 1.1
--- lib-custom.php.dist 25 Nov 2007 06:55:07 -0000 1.2
***************
*** 108,112 ****
$msg = 81;
}
! $retval = COM_refresh($_CONF['site_url'] .'/index.php?mode=loginfail&msg='.$msg);
echo $retval;
exit;
--- 108,112 ----
$msg = 81;
}
! $retval = COM_refresh($_CONF['site_url'] .'/index.php?mode=loginfail&msg='.$msg);
echo $retval;
exit;
***************
*** 233,239 ****
$retval .= '<tr>
<td align="right"><b>Custom Fields:</b></td>
! <td><input type="text" name="custom1" size="50" value="' . $var .'"></td>
</tr>';
! $retval .= '<tr><td colspan="2"><hr></td></tr>';
return $retval;
--- 233,239 ----
$retval .= '<tr>
<td align="right"><b>Custom Fields:</b></td>
! <td><input type="text" name="custom1" size="50" value="' . $var .'"' . XHTML . '></td>
</tr>';
! $retval .= '<tr><td colspan="2"><hr' . XHTML . '></td></tr>';
return $retval;
***************
*** 278,286 ****
$post_url = $_CONF['site_url'] . '/users.php';
$postmode = 'create';
! $submitbutton = '<input type="submit" value="Register Now!">';
$message = "<blockquote style=\"padding-top:10px;\"><b>Please complete the application below. Once you have completed the application, click the Register Now! button and the application will be processed immediately.</b></blockquote>";
$user_templates = new Template ($_CONF['path_layout'] . 'custom');
$user_templates->set_file('memberdetail', 'memberdetail.thtml');
$user_templates->set_var('site_url', $_CONF['site_url']);
$user_templates->set_var('layout_url', $_CONF['layout_url']);
--- 278,287 ----
$post_url = $_CONF['site_url'] . '/users.php';
$postmode = 'create';
! $submitbutton = '<input type="submit" value="Register Now!"' . XHTML . '>';
$message = "<blockquote style=\"padding-top:10px;\"><b>Please complete the application below. Once you have completed the application, click the Register Now! button and the application will be processed immediately.</b></blockquote>";
$user_templates = new Template ($_CONF['path_layout'] . 'custom');
$user_templates->set_file('memberdetail', 'memberdetail.thtml');
+ $user_templates->set_var( 'xhtml', XHTML );
$user_templates->set_var('site_url', $_CONF['site_url']);
$user_templates->set_var('layout_url', $_CONF['layout_url']);
Index: lib-security.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/lib-security.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** lib-security.php 18 Nov 2007 09:32:58 -0000 1.58
--- lib-security.php 25 Nov 2007 06:55:07 -0000 1.59
***************
*** 429,432 ****
--- 429,433 ----
$perm_templates->set_file(array('editor'=>'edit_permissions.thtml'));
+ $perm_templates->set_var ( 'xhtml', XHTML );
$perm_templates->set_var ('owner', $LANG_ACCESS['owner']);
$perm_templates->set_var ('group', $LANG_ACCESS['group']);
***************
*** 1015,1019 ****
"grp_id = '$group_id'")
. '<input type="hidden" name="group_id" value="' . $group_id
! . '">';
}
--- 1016,1020 ----
"grp_id = '$group_id'")
. '<input type="hidden" name="group_id" value="' . $group_id
! . '"' . XHTML . '>';
}
Index: lib-sessions.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/lib-sessions.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** lib-sessions.php 24 Oct 2006 08:09:50 -0000 1.43
--- lib-sessions.php 25 Nov 2007 06:55:07 -0000 1.44
***************
*** 283,287 ****
}
} else {
! echo DB_error().": ".DB_error()."<BR>";
die("Insert failed in new_session()");
}
--- 283,287 ----
}
} else {
! echo DB_error().": ".DB_error()."<br" . XHTML . ">";
die("Insert failed in new_session()");
}
***************
*** 352,356 ****
if ($_SESS_VERBOSE) {
! COM_errorLog("SQL in SESS_getUserIdFromSession is:\n<BR> $sql <BR>\n");
}
--- 352,356 ----
if ($_SESS_VERBOSE) {
! COM_errorLog("SQL in SESS_getUserIdFromSession is:\n<br" . XHTML . "> $sql <br" . XHTML . ">\n");
}
- Previous message (by thread): [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
- Next message (by thread): [geeklog-cvs] Geeklog-1.x/language english.php, 1.307, 1.308 english_utf-8.php, 1.92, 1.93 japanese.php, 1.35, 1.36 japanese_utf-8.php, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the geeklog-cvs
mailing list