Menu
▾
▴
xoops-cvs2 — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(361) |
Oct
(65) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(798) |
Feb
(694) |
Mar
(586) |
Apr
(145) |
May
(24) |
Jun
(24) |
Jul
(56) |
Aug
(11) |
Sep
(138) |
Oct
(107) |
Nov
(58) |
Dec
(39) |
| 2004 |
Jan
(157) |
Feb
(24) |
Mar
(13) |
Apr
(14) |
May
(73) |
Jun
(106) |
Jul
(217) |
Aug
(91) |
Sep
(116) |
Oct
(357) |
Nov
(27) |
Dec
(272) |
| 2005 |
Jan
(97) |
Feb
(40) |
Mar
(167) |
Apr
(365) |
May
(344) |
Jun
(357) |
Jul
(407) |
Aug
(529) |
Sep
(204) |
Oct
(52) |
Nov
(80) |
Dec
(1) |
| 2006 |
Jan
(2) |
Feb
(1) |
Mar
(11) |
Apr
(112) |
May
(121) |
Jun
(86) |
Jul
(51) |
Aug
(48) |
Sep
(107) |
Oct
(20) |
Nov
(50) |
Dec
(11) |
| 2007 |
Jan
(7) |
Feb
(11) |
Mar
(8) |
Apr
(11) |
May
(2) |
Jun
(25) |
Jul
(67) |
Aug
(134) |
Sep
(54) |
Oct
(69) |
Nov
(10) |
Dec
(74) |
| 2008 |
Jan
(73) |
Feb
(81) |
Mar
(64) |
Apr
(98) |
May
(157) |
Jun
(68) |
Jul
(80) |
Aug
(108) |
Sep
(176) |
Oct
(107) |
Nov
(265) |
Dec
(60) |
| 2009 |
Jan
(149) |
Feb
(140) |
Mar
(195) |
Apr
(141) |
May
(53) |
Jun
(45) |
Jul
(98) |
Aug
(153) |
Sep
(160) |
Oct
(138) |
Nov
(139) |
Dec
(104) |
| 2010 |
Jan
(188) |
Feb
(259) |
Mar
(133) |
Apr
(104) |
May
(42) |
Jun
(121) |
Jul
(38) |
Aug
(223) |
Sep
(259) |
Oct
(255) |
Nov
(106) |
Dec
(157) |
| 2011 |
Jan
(202) |
Feb
(110) |
Mar
(261) |
Apr
(272) |
May
(218) |
Jun
(108) |
Jul
(141) |
Aug
(205) |
Sep
(326) |
Oct
(279) |
Nov
(368) |
Dec
(238) |
| 2012 |
Jan
(239) |
Feb
(3) |
Mar
|
Apr
(1) |
May
(2) |
Jun
|
Jul
(3) |
Aug
(6) |
Sep
(5) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
(3) |
Mar
(9) |
Apr
(10) |
May
|
Jun
(1) |
Jul
(3) |
Aug
(1) |
Sep
(2) |
Oct
(1) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
(1) |
| 2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
|
|
1
|
|
2
|
3
|
4
|
5
|
6
|
7
|
8
(2) |
|
9
(1) |
10
|
11
|
12
(3) |
13
|
14
|
15
|
|
16
|
17
|
18
|
19
(2) |
20
(6) |
21
(1) |
22
(9) |
|
23
(1) |
24
|
25
(3) |
26
(14) |
27
|
28
(6) |
29
|
|
30
(2) |
31
(23) |
|
|
|
|
|
|
From: Skalpa K. <sk...@us...> - 2004-05-31 23:56:09
|
Update of /cvsroot/xoops/xoops2/modules/system/admin/users In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2192/modules/system/admin/users Modified Files: main.php Log Message: Merged from xoops2_0_7-2 Index: main.php =================================================================== RCS file: /cvsroot/xoops/xoops2/modules/system/admin/users/main.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** main.php 26 May 2004 14:30:46 -0000 1.14 --- main.php 31 May 2004 23:56:01 -0000 1.15 *************** *** 130,140 **** break; case "addUser": ! if (!$uname || !$email || !$pass) { $adduser_errormsg = _AM_YMCACF; } else { $member_handler =& xoops_gethandler('member'); // make sure the username doesnt exist yet ! if ($member_handler->getUserCount(new Criteria('uname', $uname)) > 0) { ! $adduser_errormsg = 'User name '.$uname.' already exists'; } else { $newuser =& $member_handler->createUser(); --- 130,140 ---- break; case "addUser": ! if (!$username || !$email || !$password) { $adduser_errormsg = _AM_YMCACF; } else { $member_handler =& xoops_gethandler('member'); // make sure the username doesnt exist yet ! if ($member_handler->getUserCount(new Criteria('uname', $username)) > 0) { ! $adduser_errormsg = 'User name '.$username.' already exists'; } else { $newuser =& $member_handler->createUser(); *************** *** 146,150 **** } $newuser->setVar("name", $name); ! $newuser->setVar("uname", $uname); $newuser->setVar("email", $email); $newuser->setVar("url", formatURL($url)); --- 146,150 ---- } $newuser->setVar("name", $name); ! $newuser->setVar("uname", $username); $newuser->setVar("email", $email); $newuser->setVar("url", formatURL($url)); *************** *** 157,161 **** $newuser->setVar("user_msnm", $user_msnm); if ($pass2 != "") { ! if ( $pass != $pass2 ) { xoops_cp_header(); echo " --- 157,161 ---- $newuser->setVar("user_msnm", $user_msnm); if ($pass2 != "") { ! if ( $password != $pass2 ) { xoops_cp_header(); echo " *************** *** 164,168 **** exit(); } ! $newuser->setVar("pass", md5($pass)); } $newuser->setVar("timezone_offset", $timezone_offset); --- 164,168 ---- exit(); } ! $newuser->setVar("pass", md5($password)); } $newuser->setVar("timezone_offset", $timezone_offset); |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 23:56:09
|
Update of /cvsroot/xoops/xoops2/modules/system/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2192/modules/system/admin Modified Files: groupperm.php Log Message: Merged from xoops2_0_7-2 Index: groupperm.php =================================================================== RCS file: /cvsroot/xoops/xoops2/modules/system/admin/groupperm.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** groupperm.php 26 May 2004 14:30:44 -0000 1.5 --- groupperm.php 31 May 2004 23:56:00 -0000 1.6 *************** *** 1,3 **** --- 1,5 ---- <?php + // $Id$ + include '../../../include/cp_header.php'; $modid = isset($HTTP_POST_VARS['modid']) ? intval($HTTP_POST_VARS['modid']) : 0; *************** *** 56,60 **** $backlink = XOOPS_URL.'/admin.php'; if ($module->getVar('hasadmin')) { ! $adminindex = $module->getInfo('adminindex'); if ($adminindex) { $backlink = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'.$adminindex; --- 58,62 ---- $backlink = XOOPS_URL.'/admin.php'; if ($module->getVar('hasadmin')) { ! $adminindex = isset($_POST['redirect_url']) ? $_POST['redirect_url'] : $module->getInfo('adminindex'); if ($adminindex) { $backlink = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'.$adminindex; |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 23:56:09
|
Update of /cvsroot/xoops/xoops2/modules/system/admin/groups In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2192/modules/system/admin/groups Modified Files: groups.php Log Message: Merged from xoops2_0_7-2 Index: groups.php =================================================================== RCS file: /cvsroot/xoops/xoops2/modules/system/admin/groups/groups.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** groups.php 5 Sep 2003 10:08:17 -0000 1.9 --- groups.php 31 May 2004 23:56:00 -0000 1.10 *************** *** 135,139 **** <form action="admin.php" method="post"> <select name="uids[]" size="10" multiple="multiple">'."\n"; - $size = sizeof($userids); foreach ($users as $u_id => $u_name) { echo '<option value="'.$u_id.'">'.$u_name.'</option>'."\n"; --- 135,138 ---- |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 23:56:08
|
Update of /cvsroot/xoops/xoops2/modules/system/admin/banners In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2192/modules/system/admin/banners Modified Files: banners.php main.php Log Message: Merged from xoops2_0_7-2 Index: banners.php =================================================================== RCS file: /cvsroot/xoops/xoops2/modules/system/admin/banners/banners.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** banners.php 8 Oct 2003 10:37:00 -0000 1.8 --- banners.php 31 May 2004 23:56:00 -0000 1.9 *************** *** 224,230 **** function BannerFinishDelete($bid) { ! global $xoopsDB; ! $sql = sprintf("DELETE FROM %s WHERE bid = %u", $xoopsDB->prefix("bannerfinish"), $bid); ! $xoopsDB->query($sql); redirect_header("admin.php?fct=banners&op=BannersAdmin#top",1,_AM_DBUPDATED); exit(); --- 224,239 ---- function BannerFinishDelete($bid) { ! xoops_cp_header(); ! xoops_confirm(array('op' => 'BannerFinishDelete2', 'bid' => $bid, 'fct' => 'banners'), 'admin.php', _AM_SUREDELE); ! xoops_cp_footer(); ! } ! ! function BannerFinishDelete2($bid) ! { ! global $xoopsDB; ! if ($bid > 0) { ! $sql = sprintf("DELETE FROM %s WHERE bid = %u", $xoopsDB->prefix("bannerfinish"), $bid); ! $xoopsDB->query($sql); ! } redirect_header("admin.php?fct=banners&op=BannersAdmin#top",1,_AM_DBUPDATED); exit(); Index: main.php =================================================================== RCS file: /cvsroot/xoops/xoops2/modules/system/admin/banners/main.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** main.php 30 Mar 2003 06:11:46 -0000 1.9 --- main.php 31 May 2004 23:56:00 -0000 1.10 *************** *** 52,56 **** break; case "BannerFinishDelete": ! BannerFinishDelete($bid); break; case "BannerDelete": --- 52,59 ---- break; case "BannerFinishDelete": ! BannerFinishDelete( intval($_GET['bid']) ); ! break; ! case "BannerFinishDelete2": ! BannerFinishDelete2( intval($_POST['bid']) ); break; case "BannerDelete": |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 23:56:08
|
Update of /cvsroot/xoops/xoops2/modules/system/admin/findusers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2192/modules/system/admin/findusers Modified Files: main.php Log Message: Merged from xoops2_0_7-2 Index: main.php =================================================================== RCS file: /cvsroot/xoops/xoops2/modules/system/admin/findusers/main.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** main.php 8 Jul 2003 12:38:09 -0000 1.8 --- main.php 31 May 2004 23:56:00 -0000 1.9 *************** *** 354,357 **** --- 354,358 ---- echo "<h4>"._AM_NOFOUND,"</h4>"; } elseif ( $start < $total ) { + echo sprintf(_AM_USERSFOUND, $total)."<br />"; echo "<form action='admin.php' method='post' name='memberslist' id='memberslist'><input type='hidden' name='op' value='delete_many' /> <table width='100%' border='0' cellspacing='1' cellpadding='4' class='outer'><tr><th align='center'><input type='checkbox' name='memberslist_checkall' id='memberslist_checkall' /></th><th align='center'>"._AM_AVATAR."</th><th align='center'>"._AM_UNAME."</th><th align='center'>"._AM_REALNAME."</th><th align='center'>"._AM_EMAIL."</th><th align='center'>"._AM_PM."</th><th align='center'>"._AM_URL."</th><th align='center'>"._AM_REGDATE."</th><th align='center'>"._AM_LASTLOGIN."</th><th align='center'>"._AM_POSTS."</th><th align='center'> </th></tr>"; |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 23:56:08
|
Update of /cvsroot/xoops/xoops2/modules/system/admin/blocksadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2192/modules/system/admin/blocksadmin Modified Files: blocksadmin.php Log Message: Merged from xoops2_0_7-2 Index: blocksadmin.php =================================================================== RCS file: /cvsroot/xoops/xoops2/modules/system/admin/blocksadmin/blocksadmin.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** blocksadmin.php 2 Oct 2003 07:16:46 -0000 1.20 --- blocksadmin.php 31 May 2004 23:56:00 -0000 1.21 *************** *** 296,301 **** } } else { ! if ($xoopsTpl->is_cached('db:system_dummy.html', 'block'.$bid)) { ! if (!$xoopsTpl->clear_cache('db:system_dummy.html', 'block'.$bid)) { $msg = 'Unable to clear cache for block ID'.$bid; } --- 296,301 ---- } } else { ! if ($xoopsTpl->is_cached('db:system_dummy.html', 'blk_'.$bid)) { ! if (!$xoopsTpl->clear_cache('db:system_dummy.html', 'blk_'.$bid)) { $msg = 'Unable to clear cache for block ID'.$bid; } |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 23:56:08
|
Update of /cvsroot/xoops/xoops2/language/english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2192/language/english Modified Files: global.php Log Message: Merged from xoops2_0_7-2 Index: global.php =================================================================== RCS file: /cvsroot/xoops/xoops2/language/english/global.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** global.php 3 Oct 2003 22:50:58 -0000 1.13 --- global.php 31 May 2004 23:55:59 -0000 1.14 *************** *** 104,108 **** define('_ADDIMAGE','Add Image File'); define('_IMAGENAME','Name:'); ! define('_IMGMAXSIZE','Max size allowed (kb):'); define('_IMGMAXWIDTH','Max width allowed (pixels):'); define('_IMGMAXHEIGHT','Max height allowed (pixels):'); --- 104,108 ---- define('_ADDIMAGE','Add Image File'); define('_IMAGENAME','Name:'); ! define('_IMGMAXSIZE','Max size allowed (bytes):'); define('_IMGMAXWIDTH','Max width allowed (pixels):'); define('_IMGMAXHEIGHT','Max height allowed (pixels):'); |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 23:53:49
|
Update of /cvsroot/xoops/xoops2/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1837/kernel Modified Files: configitem.php image.php object.php Log Message: Merged from xoops2_0_7-2 Index: image.php =================================================================== RCS file: /cvsroot/xoops/xoops2/kernel/image.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** image.php 6 Jan 2004 09:16:33 -0000 1.5 --- image.php 31 May 2004 23:53:40 -0000 1.6 *************** *** 186,189 **** --- 186,190 ---- } $sql = sprintf("DELETE FROM %s WHERE image_id = %u", $this->db->prefix('imagebody'), $id); + $this->db->query($sql); return true; } Index: object.php =================================================================== RCS file: /cvsroot/xoops/xoops2/kernel/object.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** object.php 17 Jun 2003 14:25:07 -0000 1.7 --- object.php 31 May 2004 23:53:40 -0000 1.8 *************** *** 454,458 **** continue; } ! if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$cleanv)) { $this->setErrors("Invalid Email"); continue; --- 454,458 ---- continue; } ! if ($cleanv != '' && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$cleanv)) { $this->setErrors("Invalid Email"); continue; Index: configitem.php =================================================================== RCS file: /cvsroot/xoops/xoops2/kernel/configitem.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configitem.php 27 Mar 2003 14:52:14 -0000 1.4 --- configitem.php 31 May 2004 23:53:40 -0000 1.5 *************** *** 79,83 **** $this->initVar('conf_name', XOBJ_DTYPE_OTHER); $this->initVar('conf_title', XOBJ_DTYPE_TXTBOX); ! $this->initVar('conf_value', XOBJ_DTYPE_TXTAREA); $this->initVar('conf_desc', XOBJ_DTYPE_OTHER); $this->initVar('conf_formtype', XOBJ_DTYPE_OTHER); --- 79,83 ---- $this->initVar('conf_name', XOBJ_DTYPE_OTHER); $this->initVar('conf_title', XOBJ_DTYPE_TXTBOX); ! $this->initVar('conf_value', XOBJ_DTYPE_OTHER); $this->initVar('conf_desc', XOBJ_DTYPE_OTHER); $this->initVar('conf_formtype', XOBJ_DTYPE_OTHER); |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 23:53:49
|
Update of /cvsroot/xoops/xoops2/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1837/include Modified Files: calendarjs.php comment_post.php comment_view.php searchform.php Log Message: Merged from xoops2_0_7-2 Index: comment_post.php =================================================================== RCS file: /cvsroot/xoops/xoops2/include/comment_post.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** comment_post.php 26 May 2004 14:35:27 -0000 1.30 --- comment_post.php 31 May 2004 23:53:39 -0000 1.31 *************** *** 398,400 **** break; } ! ?> --- 398,400 ---- break; } ! ?> \ No newline at end of file Index: comment_view.php =================================================================== RCS file: /cvsroot/xoops/xoops2/include/comment_view.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** comment_view.php 26 May 2004 14:35:27 -0000 1.17 --- comment_view.php 31 May 2004 23:53:39 -0000 1.18 *************** *** 209,211 **** } } ! ?> --- 209,211 ---- } } ! ?> \ No newline at end of file Index: searchform.php =================================================================== RCS file: /cvsroot/xoops/xoops2/include/searchform.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** searchform.php 20 Oct 2003 13:18:36 -0000 1.7 --- searchform.php 31 May 2004 23:53:39 -0000 1.8 *************** *** 31,35 **** // create form elements ! $search_form->addElement(new XoopsFormText(_SR_KEYWORDS, "query", 30, 255, htmlspecialchars(stripslashes(implode(" ", $queries)), ENT_QUOTES), true)); $type_select = new XoopsFormSelect(_SR_TYPE, "andor", $andor); $type_select->addOptionArray(array("AND"=>_SR_ALL, "OR"=>_SR_ANY, "exact"=>_SR_EXACT)); --- 31,35 ---- // create form elements ! $search_form->addElement(new XoopsFormText(_SR_KEYWORDS, "query", 30, 255, htmlspecialchars(stripslashes(implode(" ", $queries)), ENT_QUOTES)), true); $type_select = new XoopsFormSelect(_SR_TYPE, "andor", $andor); $type_select->addOptionArray(array("AND"=>_SR_ALL, "OR"=>_SR_ANY, "exact"=>_SR_EXACT)); Index: calendarjs.php =================================================================== RCS file: /cvsroot/xoops/xoops2/include/calendarjs.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** calendarjs.php 6 Feb 2004 15:54:56 -0000 1.2 --- calendarjs.php 31 May 2004 23:53:39 -0000 1.3 *************** *** 32,36 **** if (calendar != null) { calendar.hide(); - calendar.parseDate(el.value); } else { var cal = new Calendar(true, <?php if (isset($jstime)) { echo 'new Date('.$jstime.')'; } else { echo 'null';}?>, selected, closeHandler); --- 32,35 ---- *************** *** 40,43 **** --- 39,43 ---- } calendar.sel = el; + calendar.parseDate(el.value); calendar.showAtElement(el); Calendar.addEvent(document, "mousedown", checkCalendar); |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 23:52:59
|
Update of /cvsroot/xoops/xoops2/class/xoopsform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1685/class/xoopsform Modified Files: form.php formdhtmltextarea.php formelementtray.php grouppermform.php Log Message: Merged from xoops2_0_7-2 Index: form.php =================================================================== RCS file: /cvsroot/xoops/xoops2/class/xoopsform/form.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** form.php 26 May 2004 14:33:20 -0000 1.13 --- form.php 31 May 2004 23:52:50 -0000 1.14 *************** *** 376,379 **** --- 376,380 ---- $js .= "\n<!-- Start Form Vaidation JavaScript //-->\n<script type='text/javascript'>\n<!--//\n"; } + $myts =& MyTextSanitizer::getInstance(); $formname = $this->getName(); $required =& $this->getRequired(); *************** *** 385,388 **** --- 386,390 ---- $eltcaption = trim( $required[$i]->getCaption() ); $eltmsg = empty($eltcaption) ? sprintf( _FORM_ENTER, $eltname ) : sprintf( _FORM_ENTER, $eltcaption ); + $eltmsg = $myts->displayTarea($eltmsg); $js .= "if ( myform.{$eltname}.value == \"\" ) " . "{ window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }\n"; *************** *** 404,411 **** $elements = array(); foreach ( $this->getElements() as $ele ) { ! $elements[$i]['name'] = $ele->getName(); ! $elements[$i]['caption'] = $ele->getCaption(); ! $elements[$i]['body'] = $ele->render(); ! $elements[$i]['hidden'] = $ele->isHidden(); $i++; } --- 406,414 ---- $elements = array(); foreach ( $this->getElements() as $ele ) { ! $n = ($ele->getName() != "") ? $ele->getName() : $i; ! $elements[$n]['name'] = $ele->getName(); ! $elements[$n]['caption'] = $ele->getCaption(); ! $elements[$n]['body'] = $ele->render(); ! $elements[$n]['hidden'] = $ele->isHidden(); $i++; } Index: grouppermform.php =================================================================== RCS file: /cvsroot/xoops/xoops2/class/xoopsform/grouppermform.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** grouppermform.php 26 May 2004 14:33:20 -0000 1.12 --- grouppermform.php 31 May 2004 23:52:50 -0000 1.13 *************** *** 73,77 **** * Constructor */ ! function XoopsGroupPermForm($title, $modid, $permname, $permdesc) { $this->XoopsForm($title, 'groupperm_form', XOOPS_URL . '/modules/system/admin/groupperm.php', 'post'); --- 73,77 ---- * Constructor */ ! function XoopsGroupPermForm($title, $modid, $permname, $permdesc, $url = "") { $this->XoopsForm($title, 'groupperm_form', XOOPS_URL . '/modules/system/admin/groupperm.php', 'post'); *************** *** 80,83 **** --- 80,86 ---- $this->_permDesc = $permdesc; $this->addElement(new XoopsFormHidden('modid', $this->_modid)); + if ($url != "") { + $this->addElement(new XoopsFormHidden('redirect_url', $url)); + } } Index: formdhtmltextarea.php =================================================================== RCS file: /cvsroot/xoops/xoops2/class/xoopsform/formdhtmltextarea.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** formdhtmltextarea.php 29 Sep 2003 18:27:32 -0000 1.11 --- formdhtmltextarea.php 31 May 2004 23:52:50 -0000 1.12 *************** *** 89,93 **** $sizearray = array("xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large"); ! $ret .= "<select id='".$this->getName()."Size' >\n"; $ret .= "<option value='SIZE'>"._SIZE."</option>\n"; foreach ( $sizearray as $size ) { --- 89,93 ---- $sizearray = array("xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large"); ! $ret .= "<select id='".$this->getName()."Size' >\n"; $ret .= "<option value='SIZE'>"._SIZE."</option>\n"; foreach ( $sizearray as $size ) { Index: formelementtray.php =================================================================== RCS file: /cvsroot/xoops/xoops2/class/xoopsform/formelementtray.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** formelementtray.php 27 Jun 2003 13:15:22 -0000 1.12 --- formelementtray.php 31 May 2004 23:52:50 -0000 1.13 *************** *** 76,80 **** * @param string $delimiter HTML to separate the elements */ ! function XoopsFormElementTray($caption, $delimeter=" "){ $this->setCaption($caption); $this->_delimeter = $delimeter; --- 76,81 ---- * @param string $delimiter HTML to separate the elements */ ! function XoopsFormElementTray($caption, $delimeter=" ", $name=""){ ! $this->setName($name); $this->setCaption($caption); $this->_delimeter = $delimeter; *************** *** 134,138 **** $count = count($this->_elements); for ($i = 0; $i < $count; $i++) { ! if (!isContainer($this->_elements[$i])) { $ret[] =& $this->_elements[$i]; } else { --- 135,139 ---- $count = count($this->_elements); for ($i = 0; $i < $count; $i++) { ! if (!$this->_elements[$i]->isContainer()) { $ret[] =& $this->_elements[$i]; } else { |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 23:52:58
|
Update of /cvsroot/xoops/xoops2/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1685/class Modified Files: module.textsanitizer.php uploader.php xoopsmailer.php xoopstree.php Log Message: Merged from xoops2_0_7-2 Index: xoopsmailer.php =================================================================== RCS file: /cvsroot/xoops/xoops2/class/xoopsmailer.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** xoopsmailer.php 25 Jan 2004 07:00:22 -0000 1.15 --- xoopsmailer.php 31 May 2004 23:52:49 -0000 1.16 *************** *** 91,95 **** // custom headers // private ! var $addHeaders; // subjet of mail --- 91,95 ---- // custom headers // private ! var $headers; // subjet of mail *************** *** 383,386 **** --- 383,387 ---- $this->multimailer->From = $this->fromEmail; } + $this->multimailer->ClearCustomHeaders(); foreach ($this->headers as $header) { $this->multimailer->AddCustomHeader($header); *************** *** 516,518 **** } } ! ?> --- 517,519 ---- } } ! ?> \ No newline at end of file Index: uploader.php =================================================================== RCS file: /cvsroot/xoops/xoops2/class/uploader.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** uploader.php 25 Jan 2004 07:16:07 -0000 1.13 --- uploader.php 31 May 2004 23:52:49 -0000 1.14 *************** *** 173,176 **** --- 173,180 ---- return false; } + if ( preg_match( '/\.(php|cgi|pl|py|asp)$/i', $this->mediaName ) ) { + $this->setErrors('Filename rejected'); + return false; + } if ($this->mediaTmpName == 'none' || !is_uploaded_file($this->mediaTmpName)) { $this->setErrors('No file uploaded'); *************** *** 369,373 **** } if (false !== $dimension = getimagesize($this->mediaTmpName)) { ! if ($dimension[1] > $this->maxWidth) { return false; } --- 373,377 ---- } if (false !== $dimension = getimagesize($this->mediaTmpName)) { ! if ($dimension[1] > $this->maxHeight) { return false; } Index: module.textsanitizer.php =================================================================== RCS file: /cvsroot/xoops/xoops2/class/module.textsanitizer.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** module.textsanitizer.php 15 Aug 2003 02:53:01 -0000 1.23 --- module.textsanitizer.php 31 May 2004 23:52:49 -0000 1.24 *************** *** 147,152 **** $patterns = array(); $replacements = array(); ! $patterns[] = "/\[code](.*)\[\/code\]/esU"; ! $replacements[] = "'<div class=\"xoopsCode\"><code><pre>'.wordwrap(MyTextSanitizer::htmlSpecialChars('\\1'), 100).'</pre></code></div>'"; // RMV: added new markup for intrasite url (allows easier site moves) // TODO: automatically convert other URLs to this format if XOOPS_URL matches?? --- 147,152 ---- $patterns = array(); $replacements = array(); ! //$patterns[] = "/\[code](.*)\[\/code\]/esU"; ! //$replacements[] = "'<div class=\"xoopsCode\"><code><pre>'.wordwrap(MyTextSanitizer::htmlSpecialChars('\\1'), 100).'</pre></code></div>'"; // RMV: added new markup for intrasite url (allows easier site moves) // TODO: automatically convert other URLs to this format if XOOPS_URL matches?? *************** *** 285,288 **** --- 285,289 ---- $text =& $this->htmlSpecialChars($text); } + $text =& $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18) $text =& $this->makeClickable($text); if ($smiley != 0) { *************** *** 303,306 **** --- 304,308 ---- $text =& $this->nl2Br($text); } + $text =& $this->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18) return $text; } *************** *** 324,327 **** --- 326,330 ---- $text =& $this->htmlSpecialChars($text); } + $text =& $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18) $text =& $this->makeClickable($text); if ($smiley != 0) { *************** *** 342,345 **** --- 345,349 ---- $text =& $this->nl2Br($text); } + $text =& $this->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18) return $text; } *************** *** 378,381 **** --- 382,431 ---- + /**#@+ + * Sanitizing of [code] tag + */ + function codePreConv($text, $xcode = 1) { + if($xcode != 0){ + $patterns = "/\[code](.*)\[\/code\]/esU"; + $replacements = "'[code]'.base64_encode('$1').'[/code]'"; + $text = preg_replace($patterns, $replacements, $text); + } + return $text; + } + + function codeConv($text, $xcode = 1, $image = 1){ + if($xcode != 0){ + $patterns = "/\[code](.*)\[\/code\]/esU"; + if ($image != 0) { + // image allowed + $replacements = "'<div class=\"xoopsCode\"><code><pre>'.MyTextSanitizer::codeSanitizer('$1').'</pre></code></div>'"; + //$text =& $this->xoopsCodeDecode($text); + } else { + // image not allowed + $replacements = "'<div class=\"xoopsCode\"><code><pre>'.MyTextSanitizer::codeSanitizer('$1', 0).'</pre></code></div>'"; + //$text =& $this->xoopsCodeDecode($text, 0); + } + $text = preg_replace($patterns, $replacements, $text); + } + return $text; + } + + function codeSanitizer($str, $image = 1){ + if($image != 0){ + $str = $this->xoopsCodeDecode( + $this->htmlSpecialChars(str_replace('\"', '"', base64_decode($str))) + ); + }else{ + $str = $this->xoopsCodeDecode( + $this->htmlSpecialChars(str_replace('\"', '"', base64_decode($str))),0 + ); + } + return $str; + } + + + /**#@-*/ + + ##################### Deprecated Methods ###################### *************** *** 515,517 **** /**#@-*/ } ! ?> --- 565,567 ---- /**#@-*/ } ! ?> \ No newline at end of file Index: xoopstree.php =================================================================== RCS file: /cvsroot/xoops/xoops2/class/xoopstree.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** xoopstree.php 12 Feb 2003 11:34:52 -0000 1.5 --- xoopstree.php 31 May 2004 23:52:49 -0000 1.6 *************** *** 168,172 **** echo "<option value='$catid'$sel>$name</option>\n"; $sel = ""; ! $arr = $this->getChildTreeArray($catid); foreach ( $arr as $option ) { $option['prefix'] = str_replace(".","--",$option['prefix']); --- 168,172 ---- echo "<option value='$catid'$sel>$name</option>\n"; $sel = ""; ! $arr = $this->getChildTreeArray($catid, $order); foreach ( $arr as $option ) { $option['prefix'] = str_replace(".","--",$option['prefix']); |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 22:26:06
|
Update of /cvsroot/xoops/xoops2/modules/system/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14915/modules/system/admin Modified Files: Tag: xoops2_0_7 groupperm.php Log Message: Added CVS version string Index: groupperm.php =================================================================== RCS file: /cvsroot/xoops/xoops2/modules/system/admin/groupperm.php,v retrieving revision 1.4.8.2 retrieving revision 1.4.8.3 diff -C2 -d -r1.4.8.2 -r1.4.8.3 *** groupperm.php 28 May 2004 17:18:10 -0000 1.4.8.2 --- groupperm.php 31 May 2004 22:25:58 -0000 1.4.8.3 *************** *** 1,3 **** --- 1,5 ---- <?php + // $Id$ + include '../../../include/cp_header.php'; $modid = isset($HTTP_POST_VARS['modid']) ? intval($HTTP_POST_VARS['modid']) : 0; |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 22:19:36
|
Update of /cvsroot/xoops/xoops2/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13543/class Modified Files: Tag: xoops2_0_7 xoopsmailer.php Log Message: Fixing bug #961313 by adding call to ClearCustomHeaders() Index: xoopsmailer.php =================================================================== RCS file: /cvsroot/xoops/xoops2/class/xoopsmailer.php,v retrieving revision 1.15.8.1 retrieving revision 1.15.8.2 diff -C2 -d -r1.15.8.1 -r1.15.8.2 *** xoopsmailer.php 28 May 2004 16:53:53 -0000 1.15.8.1 --- xoopsmailer.php 31 May 2004 22:19:27 -0000 1.15.8.2 *************** *** 383,386 **** --- 383,387 ---- $this->multimailer->From = $this->fromEmail; } + $this->multimailer->ClearCustomHeaders(); foreach ($this->headers as $header) { $this->multimailer->AddCustomHeader($header); *************** *** 516,518 **** } } ! ?> --- 517,519 ---- } } ! ?> \ No newline at end of file |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 22:15:45
|
Update of /cvsroot/xoops/xoops2/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12762/kernel Modified Files: Tag: xoops2_0_7 configitem.php Log Message: Changed conf_value var to DTYPE_OTHER to prevent it from being processed by word censoring feature Index: configitem.php =================================================================== RCS file: /cvsroot/xoops/xoops2/kernel/configitem.php,v retrieving revision 1.4 retrieving revision 1.4.10.1 diff -C2 -d -r1.4 -r1.4.10.1 *** configitem.php 27 Mar 2003 14:52:14 -0000 1.4 --- configitem.php 31 May 2004 22:15:36 -0000 1.4.10.1 *************** *** 79,83 **** $this->initVar('conf_name', XOBJ_DTYPE_OTHER); $this->initVar('conf_title', XOBJ_DTYPE_TXTBOX); ! $this->initVar('conf_value', XOBJ_DTYPE_TXTAREA); $this->initVar('conf_desc', XOBJ_DTYPE_OTHER); $this->initVar('conf_formtype', XOBJ_DTYPE_OTHER); --- 79,83 ---- $this->initVar('conf_name', XOBJ_DTYPE_OTHER); $this->initVar('conf_title', XOBJ_DTYPE_TXTBOX); ! $this->initVar('conf_value', XOBJ_DTYPE_OTHER); $this->initVar('conf_desc', XOBJ_DTYPE_OTHER); $this->initVar('conf_formtype', XOBJ_DTYPE_OTHER); |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 21:53:18
|
Update of /cvsroot/xoops/xoops2/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7855/class Modified Files: Tag: xoops2_0_7 module.textsanitizer.php Log Message: Applied Ryuji's enhancements to the [code] tag closing bug #960683 Index: module.textsanitizer.php =================================================================== RCS file: /cvsroot/xoops/xoops2/class/module.textsanitizer.php,v retrieving revision 1.23 retrieving revision 1.23.10.1 diff -C2 -d -r1.23 -r1.23.10.1 *** module.textsanitizer.php 15 Aug 2003 02:53:01 -0000 1.23 --- module.textsanitizer.php 31 May 2004 21:53:10 -0000 1.23.10.1 *************** *** 147,152 **** $patterns = array(); $replacements = array(); ! $patterns[] = "/\[code](.*)\[\/code\]/esU"; ! $replacements[] = "'<div class=\"xoopsCode\"><code><pre>'.wordwrap(MyTextSanitizer::htmlSpecialChars('\\1'), 100).'</pre></code></div>'"; // RMV: added new markup for intrasite url (allows easier site moves) // TODO: automatically convert other URLs to this format if XOOPS_URL matches?? --- 147,152 ---- $patterns = array(); $replacements = array(); ! //$patterns[] = "/\[code](.*)\[\/code\]/esU"; ! //$replacements[] = "'<div class=\"xoopsCode\"><code><pre>'.wordwrap(MyTextSanitizer::htmlSpecialChars('\\1'), 100).'</pre></code></div>'"; // RMV: added new markup for intrasite url (allows easier site moves) // TODO: automatically convert other URLs to this format if XOOPS_URL matches?? *************** *** 285,288 **** --- 285,289 ---- $text =& $this->htmlSpecialChars($text); } + $text =& $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18) $text =& $this->makeClickable($text); if ($smiley != 0) { *************** *** 303,306 **** --- 304,308 ---- $text =& $this->nl2Br($text); } + $text =& $this->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18) return $text; } *************** *** 324,327 **** --- 326,330 ---- $text =& $this->htmlSpecialChars($text); } + $text =& $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18) $text =& $this->makeClickable($text); if ($smiley != 0) { *************** *** 342,345 **** --- 345,349 ---- $text =& $this->nl2Br($text); } + $text =& $this->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18) return $text; } *************** *** 378,381 **** --- 382,431 ---- + /**#@+ + * Sanitizing of [code] tag + */ + function codePreConv($text, $xcode = 1) { + if($xcode != 0){ + $patterns = "/\[code](.*)\[\/code\]/esU"; + $replacements = "'[code]'.base64_encode('$1').'[/code]'"; + $text = preg_replace($patterns, $replacements, $text); + } + return $text; + } + + function codeConv($text, $xcode = 1, $image = 1){ + if($xcode != 0){ + $patterns = "/\[code](.*)\[\/code\]/esU"; + if ($image != 0) { + // image allowed + $replacements = "'<div class=\"xoopsCode\"><code><pre>'.MyTextSanitizer::codeSanitizer('$1').'</pre></code></div>'"; + //$text =& $this->xoopsCodeDecode($text); + } else { + // image not allowed + $replacements = "'<div class=\"xoopsCode\"><code><pre>'.MyTextSanitizer::codeSanitizer('$1', 0).'</pre></code></div>'"; + //$text =& $this->xoopsCodeDecode($text, 0); + } + $text = preg_replace($patterns, $replacements, $text); + } + return $text; + } + + function codeSanitizer($str, $image = 1){ + if($image != 0){ + $str = $this->xoopsCodeDecode( + $this->htmlSpecialChars(str_replace('\"', '"', base64_decode($str))) + ); + }else{ + $str = $this->xoopsCodeDecode( + $this->htmlSpecialChars(str_replace('\"', '"', base64_decode($str))),0 + ); + } + return $str; + } + + + /**#@-*/ + + ##################### Deprecated Methods ###################### *************** *** 515,517 **** /**#@-*/ } ! ?> --- 565,567 ---- /**#@-*/ } ! ?> \ No newline at end of file |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 03:10:54
|
Update of /cvsroot/xoops/xoops2/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv775/class Modified Files: Tag: xoops2_0_7 uploader.php Log Message: SECURITY FIX. In XoopsMediaUploader ( Bug #961382 ) Index: uploader.php =================================================================== RCS file: /cvsroot/xoops/xoops2/class/uploader.php,v retrieving revision 1.13.8.1 retrieving revision 1.13.8.2 diff -C2 -d -r1.13.8.1 -r1.13.8.2 *** uploader.php 30 May 2004 23:26:42 -0000 1.13.8.1 --- uploader.php 31 May 2004 03:10:41 -0000 1.13.8.2 *************** *** 173,176 **** --- 173,180 ---- return false; } + if ( preg_match( '/\.(php|cgi|pl|py|asp)$/i', $this->mediaName ) ) { + $this->setErrors('Filename rejected'); + return false; + } if ($this->mediaTmpName == 'none' || !is_uploaded_file($this->mediaTmpName)) { $this->setErrors('No file uploaded'); |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 01:38:48
|
Update of /cvsroot/xoops/xoops2/modules/system/admin/groups In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20054/modules/system/admin/groups Modified Files: Tag: xoops2_0_7 groups.php Log Message: Removed undefined variable in group modify Index: groups.php =================================================================== RCS file: /cvsroot/xoops/xoops2/modules/system/admin/groups/groups.php,v retrieving revision 1.9 retrieving revision 1.9.10.1 diff -C2 -d -r1.9 -r1.9.10.1 *** groups.php 5 Sep 2003 10:08:17 -0000 1.9 --- groups.php 31 May 2004 01:38:39 -0000 1.9.10.1 *************** *** 135,139 **** <form action="admin.php" method="post"> <select name="uids[]" size="10" multiple="multiple">'."\n"; - $size = sizeof($userids); foreach ($users as $u_id => $u_name) { echo '<option value="'.$u_id.'">'.$u_name.'</option>'."\n"; --- 135,138 ---- |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 01:10:38
|
Update of /cvsroot/xoops/xoops2/modules/system/admin/blocksadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16252/modules/system/admin/blocksadmin Modified Files: Tag: xoops2_0_7 blocksadmin.php Log Message: Fixed bug preventing blacks cache to be cleared in blocks admin (from kazu on sf.jp) Index: blocksadmin.php =================================================================== RCS file: /cvsroot/xoops/xoops2/modules/system/admin/blocksadmin/blocksadmin.php,v retrieving revision 1.20 retrieving revision 1.20.10.1 diff -C2 -d -r1.20 -r1.20.10.1 *** blocksadmin.php 2 Oct 2003 07:16:46 -0000 1.20 --- blocksadmin.php 31 May 2004 01:10:28 -0000 1.20.10.1 *************** *** 296,301 **** } } else { ! if ($xoopsTpl->is_cached('db:system_dummy.html', 'block'.$bid)) { ! if (!$xoopsTpl->clear_cache('db:system_dummy.html', 'block'.$bid)) { $msg = 'Unable to clear cache for block ID'.$bid; } --- 296,301 ---- } } else { ! if ($xoopsTpl->is_cached('db:system_dummy.html', 'blk_'.$bid)) { ! if (!$xoopsTpl->clear_cache('db:system_dummy.html', 'blk_'.$bid)) { $msg = 'Unable to clear cache for block ID'.$bid; } |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 01:07:27
|
Update of /cvsroot/xoops/xoops2/modules/system/admin/banners In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15755/modules/system/admin/banners Modified Files: Tag: xoops2_0_7 main.php Log Message: Fixed bug preventing deletion of finished banners (from kazu on sf.jp) Index: main.php =================================================================== RCS file: /cvsroot/xoops/xoops2/modules/system/admin/banners/main.php,v retrieving revision 1.9 retrieving revision 1.9.10.1 diff -C2 -d -r1.9 -r1.9.10.1 *** main.php 30 Mar 2003 06:11:46 -0000 1.9 --- main.php 31 May 2004 01:07:03 -0000 1.9.10.1 *************** *** 52,56 **** break; case "BannerFinishDelete": ! BannerFinishDelete($bid); break; case "BannerDelete": --- 52,59 ---- break; case "BannerFinishDelete": ! BannerFinishDelete( intval($_GET['bid']) ); ! break; ! case "BannerFinishDelete2": ! BannerFinishDelete2( intval($_POST['bid']) ); break; case "BannerDelete": |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 01:04:03
|
Update of /cvsroot/xoops/xoops2/modules/system/admin/banners In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15254/modules/system/admin/banners Modified Files: Tag: xoops2_0_7 banners.php Log Message: Fixed bug preventing deletion of finished banners (from kazu on sf.jp) Index: banners.php =================================================================== RCS file: /cvsroot/xoops/xoops2/modules/system/admin/banners/banners.php,v retrieving revision 1.8 retrieving revision 1.8.10.1 diff -C2 -d -r1.8 -r1.8.10.1 *** banners.php 8 Oct 2003 10:37:00 -0000 1.8 --- banners.php 31 May 2004 01:03:41 -0000 1.8.10.1 *************** *** 224,230 **** function BannerFinishDelete($bid) { ! global $xoopsDB; ! $sql = sprintf("DELETE FROM %s WHERE bid = %u", $xoopsDB->prefix("bannerfinish"), $bid); ! $xoopsDB->query($sql); redirect_header("admin.php?fct=banners&op=BannersAdmin#top",1,_AM_DBUPDATED); exit(); --- 224,239 ---- function BannerFinishDelete($bid) { ! xoops_cp_header(); ! xoops_confirm(array('op' => 'BannerFinishDelete2', 'bid' => $bid, 'fct' => 'banners'), 'admin.php', _AM_SUREDELE); ! xoops_cp_footer(); ! } ! ! function BannerFinishDelete2($bid) ! { ! global $xoopsDB; ! if ($bid > 0) { ! $sql = sprintf("DELETE FROM %s WHERE bid = %u", $xoopsDB->prefix("bannerfinish"), $bid); ! $xoopsDB->query($sql); ! } redirect_header("admin.php?fct=banners&op=BannersAdmin#top",1,_AM_DBUPDATED); exit(); |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 00:39:32
|
Update of /cvsroot/xoops/xoops2/language/english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11282/language/english Modified Files: Tag: xoops2_0_7 global.php Log Message: Updated _IMGMAXSIZE language constant to specify "bytes" instead of "kb" as it should (from sum on sf.jp #4061) Index: global.php =================================================================== RCS file: /cvsroot/xoops/xoops2/language/english/global.php,v retrieving revision 1.13 retrieving revision 1.13.10.1 diff -C2 -d -r1.13 -r1.13.10.1 *** global.php 3 Oct 2003 22:50:58 -0000 1.13 --- global.php 31 May 2004 00:39:23 -0000 1.13.10.1 *************** *** 104,108 **** define('_ADDIMAGE','Add Image File'); define('_IMAGENAME','Name:'); ! define('_IMGMAXSIZE','Max size allowed (kb):'); define('_IMGMAXWIDTH','Max width allowed (pixels):'); define('_IMGMAXHEIGHT','Max height allowed (pixels):'); --- 104,108 ---- define('_ADDIMAGE','Add Image File'); define('_IMAGENAME','Name:'); ! define('_IMGMAXSIZE','Max size allowed (bytes):'); define('_IMGMAXWIDTH','Max width allowed (pixels):'); define('_IMGMAXHEIGHT','Max height allowed (pixels):'); |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 00:36:17
|
Update of /cvsroot/xoops/xoops2/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10660/kernel Modified Files: Tag: xoops2_0_7 object.php Log Message: Fixed bug preventing cleanVars to accept empty e-mail fields (from kazu on sf.jp) Index: object.php =================================================================== RCS file: /cvsroot/xoops/xoops2/kernel/object.php,v retrieving revision 1.7 retrieving revision 1.7.10.1 diff -C2 -d -r1.7 -r1.7.10.1 *** object.php 17 Jun 2003 14:25:07 -0000 1.7 --- object.php 31 May 2004 00:36:08 -0000 1.7.10.1 *************** *** 454,458 **** continue; } ! if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$cleanv)) { $this->setErrors("Invalid Email"); continue; --- 454,458 ---- continue; } ! if ($cleanv != '' && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$cleanv)) { $this->setErrors("Invalid Email"); continue; |
|
From: Skalpa K. <sk...@us...> - 2004-05-31 00:13:30
|
Update of /cvsroot/xoops/xoops2/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6658/kernel Modified Files: Tag: xoops2_0_7 image.php Log Message: Fixing bug [ 963327 ] XoopsImageHandler delete() keeps rows in imagebody tbl Index: image.php =================================================================== RCS file: /cvsroot/xoops/xoops2/kernel/image.php,v retrieving revision 1.5 retrieving revision 1.5.8.1 diff -C2 -d -r1.5 -r1.5.8.1 *** image.php 6 Jan 2004 09:16:33 -0000 1.5 --- image.php 31 May 2004 00:13:21 -0000 1.5.8.1 *************** *** 186,189 **** --- 186,190 ---- } $sql = sprintf("DELETE FROM %s WHERE image_id = %u", $this->db->prefix('imagebody'), $id); + $this->db->query($sql); return true; } |
|
From: Skalpa K. <sk...@us...> - 2004-05-30 23:26:57
|
Update of /cvsroot/xoops/xoops2/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30809/class Modified Files: Tag: xoops2_0_7 uploader.php Log Message: Fixing bug [ 963301 ] XoopsMediaUploader checkMaxHeight() doesn't work Index: uploader.php =================================================================== RCS file: /cvsroot/xoops/xoops2/class/uploader.php,v retrieving revision 1.13 retrieving revision 1.13.8.1 diff -C2 -d -r1.13 -r1.13.8.1 *** uploader.php 25 Jan 2004 07:16:07 -0000 1.13 --- uploader.php 30 May 2004 23:26:42 -0000 1.13.8.1 *************** *** 369,373 **** } if (false !== $dimension = getimagesize($this->mediaTmpName)) { ! if ($dimension[1] > $this->maxWidth) { return false; } --- 369,373 ---- } if (false !== $dimension = getimagesize($this->mediaTmpName)) { ! if ($dimension[1] > $this->maxHeight) { return false; } |
|
From: Jan P. <mi...@us...> - 2004-05-30 20:00:57
|
Update of /cvsroot/xoops/xoops2/class/xoopsform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29493/class/xoopsform Modified Files: Tag: xoops2_0_7 formdhtmltextarea.php Log Message: Fixed xoopsTextHidden being hard-coded following bugtracker item 963197 Index: formdhtmltextarea.php =================================================================== RCS file: /cvsroot/xoops/xoops2/class/xoopsform/formdhtmltextarea.php,v retrieving revision 1.11 retrieving revision 1.11.10.1 diff -C2 -d -r1.11 -r1.11.10.1 *** formdhtmltextarea.php 29 Sep 2003 18:27:32 -0000 1.11 --- formdhtmltextarea.php 30 May 2004 20:00:47 -0000 1.11.10.1 *************** *** 89,93 **** $sizearray = array("xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large"); ! $ret .= "<select id='".$this->getName()."Size' >\n"; $ret .= "<option value='SIZE'>"._SIZE."</option>\n"; foreach ( $sizearray as $size ) { --- 89,93 ---- $sizearray = array("xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large"); ! $ret .= "<select id='".$this->getName()."Size' >\n"; $ret .= "<option value='SIZE'>"._SIZE."</option>\n"; foreach ( $sizearray as $size ) { |