Menu
▾
▴
[Tikiwiki-cvs] tiki/lib md5.js,NONE,1.1 tikilib.php,1.19,1.20 userslib.php,1.7,1.8
|
From: <lra...@us...> - 2002-12-21 20:45:36
|
Update of /cvsroot/tikiwiki/tiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv24173/lib
Modified Files:
tikilib.php userslib.php
Added Files:
md5.js
Log Message:
Tiki 1.5 first commit of some new features:
- Trackers
- Slideshows for wiki pages
- Improved secutiry and options for login and registration
challenge response authentication added (!)
and other new features
- Of course this all still experimental.
Merry Christmas :-)
--- NEW FILE: md5.js ---
/*
* md5.jvs 1.0b 27/06/96
*
* Javascript implementation of the RSA Data Security, Inc. MD5
* Message-Digest Algorithm.
*
* Copyright (c) 1996 Henri Torgemane. All Rights Reserved.
*
* Permission to use, copy, modify, and distribute this software
* and its documentation for any purposes and without
* fee is hereby granted provided that this copyright notice
* appears in all copies.
*
* Of course, this soft is provided "as is" without express or implied
* warranty of any kind.
*
* $Id: md5.js,v 1.1 2002/12/21 20:45:03 lrargerich Exp $
*
*/
function array(n) {
for(i=0;i<n;i++) this[i]=0;
this.length=n;
}
/* Some basic logical functions had to be rewritten because of a bug in
* Javascript.. Just try to compute 0xffffffff >> 4 with it..
* Of course, these functions are slower than the original would be, but
* at least, they work!
*/
function integer(n) { return n%(0xffffffff+1); }
function shr(a,b) {
a=integer(a);
b=integer(b);
if (a-0x80000000>=0) {
a=a%0x80000000;
a>>=b;
a+=0x40000000>>(b-1);
} else
a>>=b;
return a;
}
function shl1(a) {
a=a%0x80000000;
if (a&0x40000000==0x40000000)
{
a-=0x40000000;
a*=2;
a+=0x80000000;
} else
a*=2;
return a;
}
function shl(a,b) {
a=integer(a);
b=integer(b);
for (var i=0;i<b;i++) a=shl1(a);
return a;
}
function and(a,b) {
a=integer(a);
b=integer(b);
var t1=(a-0x80000000);
var t2=(b-0x80000000);
if (t1>=0)
if (t2>=0)
return ((t1&t2)+0x80000000);
else
return (t1&b);
else
if (t2>=0)
return (a&t2);
else
return (a&b);
}
function or(a,b) {
a=integer(a);
b=integer(b);
var t1=(a-0x80000000);
var t2=(b-0x80000000);
if (t1>=0)
if (t2>=0)
return ((t1|t2)+0x80000000);
else
return ((t1|b)+0x80000000);
else
if (t2>=0)
return ((a|t2)+0x80000000);
else
return (a|b);
}
function xor(a,b) {
a=integer(a);
b=integer(b);
var t1=(a-0x80000000);
var t2=(b-0x80000000);
if (t1>=0)
if (t2>=0)
return (t1^t2);
else
return ((t1^b)+0x80000000);
else
if (t2>=0)
return ((a^t2)+0x80000000);
else
return (a^b);
}
function not(a) {
a=integer(a);
return (0xffffffff-a);
}
/* Here begin the real algorithm */
var state = new array(4);
var count = new array(2);
count[0] = 0;
count[1] = 0;
var buffer = new array(64);
var transformBuffer = new array(16);
var digestBits = new array(16);
var S11 = 7;
var S12 = 12;
var S13 = 17;
var S14 = 22;
var S21 = 5;
var S22 = 9;
var S23 = 14;
var S24 = 20;
var S31 = 4;
var S32 = 11;
var S33 = 16;
var S34 = 23;
var S41 = 6;
var S42 = 10;
var S43 = 15;
var S44 = 21;
function F(x,y,z) {
return or(and(x,y),and(not(x),z));
}
function G(x,y,z) {
return or(and(x,z),and(y,not(z)));
}
function H(x,y,z) {
return xor(xor(x,y),z);
}
function I(x,y,z) {
return xor(y ,or(x , not(z)));
}
function rotateLeft(a,n) {
return or(shl(a, n),(shr(a,(32 - n))));
}
function FF(a,b,c,d,x,s,ac) {
a = a+F(b, c, d) + x + ac;
a = rotateLeft(a, s);
a = a+b;
return a;
}
function GG(a,b,c,d,x,s,ac) {
a = a+G(b, c, d) +x + ac;
a = rotateLeft(a, s);
a = a+b;
return a;
}
function HH(a,b,c,d,x,s,ac) {
a = a+H(b, c, d) + x + ac;
a = rotateLeft(a, s);
a = a+b;
return a;
}
function II(a,b,c,d,x,s,ac) {
a = a+I(b, c, d) + x + ac;
a = rotateLeft(a, s);
a = a+b;
return a;
}
function transform(buf,offset) {
var a=0, b=0, c=0, d=0;
var x = transformBuffer;
a = state[0];
b = state[1];
c = state[2];
d = state[3];
for (i = 0; i < 16; i++) {
x[i] = and(buf[i*4+offset],0xff);
for (j = 1; j < 4; j++) {
x[i]+=shl(and(buf[i*4+j+offset] ,0xff), j * 8);
}
}
/* Round 1 */
a = FF ( a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
d = FF ( d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
c = FF ( c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
b = FF ( b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
a = FF ( a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
d = FF ( d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
c = FF ( c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
b = FF ( b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
a = FF ( a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
d = FF ( d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
c = FF ( c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
b = FF ( b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
a = FF ( a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
d = FF ( d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
c = FF ( c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
b = FF ( b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
/* Round 2 */
a = GG ( a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
d = GG ( d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
c = GG ( c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
b = GG ( b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
a = GG ( a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
d = GG ( d, a, b, c, x[10], S22, 0x2441453); /* 22 */
c = GG ( c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
b = GG ( b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
a = GG ( a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
d = GG ( d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
c = GG ( c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
b = GG ( b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
a = GG ( a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
d = GG ( d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
c = GG ( c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
b = GG ( b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
/* Round 3 */
a = HH ( a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
d = HH ( d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
c = HH ( c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
b = HH ( b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
a = HH ( a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
d = HH ( d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
c = HH ( c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
b = HH ( b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
a = HH ( a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
d = HH ( d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
c = HH ( c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
b = HH ( b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */
a = HH ( a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
d = HH ( d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
c = HH ( c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
b = HH ( b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
/* Round 4 */
a = II ( a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
d = II ( d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
c = II ( c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
b = II ( b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
a = II ( a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
d = II ( d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
c = II ( c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
b = II ( b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
a = II ( a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
d = II ( d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
c = II ( c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
b = II ( b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
a = II ( a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
d = II ( d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
c = II ( c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
b = II ( b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
state[0] +=a;
state[1] +=b;
state[2] +=c;
state[3] +=d;
}
function init() {
count[0]=count[1] = 0;
state[0] = 0x67452301;
state[1] = 0xefcdab89;
state[2] = 0x98badcfe;
state[3] = 0x10325476;
for (i = 0; i < digestBits.length; i++)
digestBits[i] = 0;
}
function update(b) {
var index,i;
index = and(shr(count[0],3) , 0x3f);
if (count[0]<0xffffffff-7)
count[0] += 8;
else {
count[1]++;
count[0]-=0xffffffff+1;
count[0]+=8;
}
buffer[index] = and(b,0xff);
if (index >= 63) {
transform(buffer, 0);
}
}
function finish() {
var bits = new array(8);
var padding;
var i=0, index=0, padLen=0;
for (i = 0; i < 4; i++) {
bits[i] = and(shr(count[0],(i * 8)), 0xff);
}
for (i = 0; i < 4; i++) {
bits[i+4]=and(shr(count[1],(i * 8)), 0xff);
}
index = and(shr(count[0], 3) ,0x3f);
padLen = (index < 56) ? (56 - index) : (120 - index);
padding = new array(64);
padding[0] = 0x80;
for (i=0;i<padLen;i++)
update(padding[i]);
for (i=0;i<8;i++)
update(bits[i]);
for (i = 0; i < 4; i++) {
for (j = 0; j < 4; j++) {
digestBits[i*4+j] = and(shr(state[i], (j * 8)) , 0xff);
}
}
}
/* End of the MD5 algorithm */
function hexa(n) {
var hexa_h = "0123456789abcdef";
var hexa_c="";
var hexa_m=n;
for (hexa_i=0;hexa_i<8;hexa_i++) {
hexa_c=hexa_h.charAt(Math.abs(hexa_m)%16)+hexa_c;
hexa_m=Math.floor(hexa_m/16);
}
return hexa_c;
}
var ascii="01234567890123456789012345678901" +
" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ"+
"[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
function MD5(entree)
{
var l,s,k,ka,kb,kc,kd;
init();
for (k=0;k<entree.length;k++) {
l=entree.charAt(k);
update(ascii.lastIndexOf(l));
}
finish();
ka=kb=kc=kd=0;
for (i=0;i<4;i++) ka+=shl(digestBits[15-i], (i*8));
for (i=4;i<8;i++) kb+=shl(digestBits[15-i], ((i-4)*8));
for (i=8;i<12;i++) kc+=shl(digestBits[15-i], ((i-8)*8));
for (i=12;i<16;i++) kd+=shl(digestBits[15-i], ((i-12)*8));
s=hexa(kd)+hexa(kc)+hexa(kb)+hexa(ka);
return s;
}
Index: tikilib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** tikilib.php 18 Dec 2002 22:05:40 -0000 1.19
--- tikilib.php 21 Dec 2002 20:45:03 -0000 1.20
***************
*** 24,27 ****
--- 24,83 ----
/* Tiki tracker construction options */
+ // Return an array with items assigned to the user or a user group
+ function get_user_items($user)
+ {
+ $items = Array();
+ $query = "select ttf.trackerId, tti.itemId from tiki_tracker_fields ttf, tiki_tracker_items tti, tiki_tracker_item_fields ttif where ttf.fieldId=ttif.fieldId and ttif.itemId=tti.itemId and type='u' and tti.status='o' and value='$user'";
+ $result = $this->db->query($query);
+ if(DB::isError($result)) $this->sql_error($query,$result);
+ $ret = Array();
+ while($res = $result->fetchRow(DB_FETCHMODE_ASSOC)) {
+ $itemId=$res["itemId"];
+ $trackerId=$res["trackerId"];
+ // Now get the isMain field for this tracker
+ $fieldId=$this->db->getOne("select fieldId from tiki_tracker_fields ttf where isMain='y' and trackerId=$trackerId");
+ // Now get the field value
+ $value = $this->db->getOne("select value from tiki_tracker_item_fields where fieldId=$fieldId and itemId=$itemId");
+ $tracker = $this->db->getOne("select name from tiki_trackers where trackerId=$trackerId");
+ $aux["trackerId"]=$trackerId;
+ $aux["itemId"]=$itemId;
+ $aux["value"]=$value;
+ $aux["name"]=$tracker;
+ if(!in_array($itemId,$items)) {
+ $ret[]=$aux;
+ $items[]=$itemId;
+ }
+ }
+
+ $groups = $this->get_user_groups($user);
+
+ foreach($groups as $group) {
+ $query = "select ttf.trackerId, tti.itemId from tiki_tracker_fields ttf, tiki_tracker_items tti, tiki_tracker_item_fields ttif where ttf.fieldId=ttif.fieldId and ttif.itemId=tti.itemId and type='g' and tti.status='o' and value='$group'";
+ $result = $this->db->query($query);
+ if(DB::isError($result)) $this->sql_error($query,$result);
+ while($res = $result->fetchRow(DB_FETCHMODE_ASSOC)) {
+ $itemId=$res["itemId"];
+ $trackerId=$res["trackerId"];
+ // Now get the isMain field for this tracker
+ $fieldId=$this->db->getOne("select fieldId from tiki_tracker_fields ttf where isMain='y' and trackerId=$trackerId");
+ // Now get the field value
+ $value = $this->db->getOne("select value from tiki_tracker_item_fields where fieldId=$fieldId and itemId=$itemId");
+ $tracker = $this->db->getOne("select name from tiki_trackers where trackerId=$trackerId");
+ $aux["trackerId"]=$trackerId;
+ $aux["itemId"]=$itemId;
+ $aux["value"]=$value;
+ $aux["name"]=$tracker;
+ if(!in_array($itemId,$items)) {
+ $ret[]=$aux;
+ $items[]=$itemId;
+ }
+ }
+
+ }
+
+ return $ret;
+ }
+
+
function add_item_attachment_hit($id)
{
***************
*** 97,100 ****
--- 153,157 ----
function replace_item_comment($commentId,$itemId,$title,$data,$user)
{
+ global $smarty;
$title=addslashes(strip_tags($title));
$data=addslashes(strip_tags($data,"<a>"));
***************
*** 110,113 ****
--- 167,183 ----
$commentId=$this->db->getOne("select max(commentId) from tiki_tracker_item_comments where posted=$now and title='$title' and itemId=$itemId");
}
+ $trackerId=$this->db->getOne("select trackerId from tiki_tracker_items where itemId=$itemId");
+ $trackerName=$this->db->getOne("select name from tiki_trackers where trackerId=$trackerId");
+ $emails = $this->get_mail_events('tracker_modified',$trackerId);
+ $emails2 = $this->get_mail_events('tracker_item_modified',$itemId);
+ $emails=array_merge($emails,$emails2);
+ $smarty->assign('mail_date',date("U"));
+ $smarty->assign('mail_user',$user);
+ $smarty->assign('mail_action','New comment added for item:'.$itemId.' at tracker '.$trackerName);
+ $smarty->assign('mail_data',$title."\n\n".$data);
+ foreach ($emails as $email) {
+ $mail_data=$smarty->fetch('mail/tracker_changed_notification.tpl');
+ @mail($email, tra('Tracker was modified at ').$_SERVER["SERVER_NAME"],$mail_data);
+ }
return $commentId;
}
***************
*** 155,159 ****
}
! function list_tracker_items($trackerId,$offset,$maxRecords,$sort_mode,$fields)
{
$filters=Array();
--- 225,229 ----
}
! function list_tracker_items($trackerId,$offset,$maxRecords,$sort_mode,$fields,$status='')
{
$filters=Array();
***************
*** 171,174 ****
--- 241,247 ----
$sort_mode = str_replace("_"," ",$sort_mode);
$mid=" where trackerId=$trackerId ";
+ if($status) {
+ $mid.=" and status='$status' ";
+ }
$query = "select * from tiki_tracker_items $mid order by $sort_mode limit $offset,$maxRecords";
$query_cant = "select count(*) from tiki_tracker_items $mid";
***************
*** 180,184 ****
$fields=Array();
$itid=$res["itemId"];
! $query2="select ttif.fieldId,name,value,isTblVisible,isMain from tiki_tracker_item_fields ttif, tiki_tracker_fields ttf where ttif.fieldId=ttf.fieldId and itemId=".$res["itemId"]." order by fieldId asc";
$result2 = $this->db->query($query2);
if(DB::isError($result2)) $this->sql_error($query2, $result2);
--- 253,257 ----
$fields=Array();
$itid=$res["itemId"];
! $query2="select ttif.fieldId,name,value,type,isTblVisible,isMain from tiki_tracker_item_fields ttif, tiki_tracker_fields ttf where ttif.fieldId=ttf.fieldId and itemId=".$res["itemId"]." order by fieldId asc";
$result2 = $this->db->query($query2);
if(DB::isError($result2)) $this->sql_error($query2, $result2);
***************
*** 277,282 ****
}
! function replace_item($trackerId,$itemId,$ins_fields)
{
$now = date("U");
$query="update tiki_trackers set lastModif=$now where trackerId=$trackerId";
--- 350,357 ----
}
! function replace_item($trackerId,$itemId,$ins_fields,$status='o')
{
+ global $user;
+ global $smarty;
$now = date("U");
$query="update tiki_trackers set lastModif=$now where trackerId=$trackerId";
***************
*** 286,299 ****
if($itemId) {
! $query="update tiki_tracker_items set lastModif=$now where itemId=$itemId";
$result = $this->db->query($query);
if(DB::isError($result)) $this->sql_error($query, $result);
} else {
! $query="replace into tiki_tracker_items(trackerId,created,lastModif) values($trackerId,$now,$now)";
$result = $this->db->query($query);
if(DB::isError($result)) $this->sql_error($query, $result);
$new_itemId=$this->db->getOne("select max(itemId) from tiki_tracker_items where created=$now and trackerId=$trackerId");
}
!
for($i=0;$i<count($ins_fields["data"]);$i++) {
$name=$ins_fields["data"][$i]["name"];
--- 361,374 ----
if($itemId) {
! $query="update tiki_tracker_items set status='$status',lastModif=$now where itemId=$itemId";
$result = $this->db->query($query);
if(DB::isError($result)) $this->sql_error($query, $result);
} else {
! $query="replace into tiki_tracker_items(trackerId,created,lastModif,status) values($trackerId,$now,$now,'$status')";
$result = $this->db->query($query);
if(DB::isError($result)) $this->sql_error($query, $result);
$new_itemId=$this->db->getOne("select max(itemId) from tiki_tracker_items where created=$now and trackerId=$trackerId");
}
! $the_data = '';
for($i=0;$i<count($ins_fields["data"]);$i++) {
$name=$ins_fields["data"][$i]["name"];
***************
*** 301,304 ****
--- 376,380 ----
$value=$ins_fields["data"][$i]["value"];
// Now check if the item is 0 or not
+ $the_data.="$name = $value\n";
if($itemId) {
$query = "update tiki_tracker_item_fields set value='$value' where itemId=$itemId and fieldId=$fieldId";
***************
*** 307,311 ****
} else {
// We add an item
-
$query="update tiki_trackers set items=items+1 where trackerId=$trackerId";
$result = $this->db->query($query);
--- 383,386 ----
***************
*** 316,319 ****
--- 391,408 ----
}
}
+ $trackerName=$this->db->getOne("select name from tiki_trackers where trackerId=$trackerId");
+ $emails = $this->get_mail_events('tracker_modified',$trackerId);
+ $emails2 = $this->get_mail_events('tracker_item_modified',$itemId);
+ $emails=array_merge($emails,$emails2);
+ $smarty->assign('mail_date',date("U"));
+ $smarty->assign('mail_user',$user);
+ $smarty->assign('mail_action','New item added or modified:'.$itemId.' at tracker '.$trackerName);
+ $smarty->assign('mail_data',$the_data);
+ foreach ($emails as $email) {
+ $mail_data=$smarty->fetch('mail/tracker_changed_notification.tpl');
+ @mail($email, tra('Tracker was modified at ').$_SERVER["SERVER_NAME"],$mail_data);
+ }
+ if(!$itemId) $itemId=$new_itemId;
+ return $itemId;
}
***************
*** 391,395 ****
// Inserts or updates a tracker
! function replace_tracker($trackerId, $name, $description,$showCreated,$showLastModif,$useComments,$useAttachments)
{
$description = addslashes($description);
--- 480,484 ----
// Inserts or updates a tracker
! function replace_tracker($trackerId, $name, $description,$showCreated,$showLastModif,$useComments,$useAttachments,$showStatus)
{
$description = addslashes($description);
***************
*** 397,407 ****
if($trackerId) {
! $query = "update tiki_trackers set name='$name',description='$description', useAttachments='$useAttachments',useComments='$useComments', showCreated='$showCreated',showLastModif='$showLastModif' where trackerId=$trackerId";
$result = $this->db->query($query);
if(DB::isError($result)) $this->sql_error($query, $result);
} else {
$now = date("U");
! $query = "replace into tiki_trackers(name,description,created,lastModif,items,showCreated,showLastModif,useComments,useAttachments)
! values('$name','$description',$now,$now,0,'$showCreated','$showLastModif','$useComments','$useAttachments')";
$result = $this->db->query($query);
if(DB::isError($result)) $this->sql_error($query, $result);
--- 486,496 ----
if($trackerId) {
! $query = "update tiki_trackers set name='$name',description='$description', useAttachments='$useAttachments',useComments='$useComments', showCreated='$showCreated',showLastModif='$showLastModif',showStatus='$showStatus' where trackerId=$trackerId";
$result = $this->db->query($query);
if(DB::isError($result)) $this->sql_error($query, $result);
} else {
$now = date("U");
! $query = "replace into tiki_trackers(name,description,created,lastModif,items,showCreated,showLastModif,useComments,useAttachments,showStatus)
! values('$name','$description',$now,$now,0,'$showCreated','$showLastModif','$useComments','$useAttachments','$showStatus')";
$result = $this->db->query($query);
if(DB::isError($result)) $this->sql_error($query, $result);
***************
*** 8560,8563 ****
--- 8649,8655 ----
}
}
+
+ // Replace links to slideshows
+
if($feature_drawings == 'y') {
Index: userslib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/userslib.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** userslib.php 6 Dec 2002 16:51:52 -0000 1.7
--- userslib.php 21 Dec 2002 20:45:03 -0000 1.8
***************
*** 109,123 ****
}
! function validate_user($user,$pass)
{
! $query = "select login from users_users where login='$user' and password='$pass'";
! $result = $this->db->query($query);
! if(DB::isError($result)) $this->sql_error($query,$result);
! if($result->numRows()) {
! $t = date("U");
! $query = "update users_users set currentLogin=$t where login='$user'";
! $result = $this->db->query($query);
! if(DB::isError($result)) $this->sql_error($query,$result);
! return true;
}
return false;
--- 109,164 ----
}
! function genPass()
{
! $vocales="aeiou";
! $consonantes="bcdfghjklmnpqrstvwxyz";
! $r='';
! for($i=0; $i<5; $i++){
! if ($i%2){
! $r.=$vocales{rand(0,strlen($vocales)-1)};
! }else{
! $r.=$consonantes{rand(0,strlen($consonantes)-1)};
! }
! }
! return $r;
! }
!
! function generate_challenge()
! {
! $val = md5($this->genPass());
! return $val;
! }
!
! function validate_user($user,$pass,$challenge)
! {
! global $feature_challenge;
! $hash=md5($pass);
! if($feature_challenge=='n') {
! $query = "select login from users_users where login='$user' and hash='$hash'";
! $result = $this->db->query($query);
! if(DB::isError($result)) $this->sql_error($query,$result);
! if($result->numRows()) {
! $t = date("U");
! $query = "update users_users set currentLogin=$t where login='$user'";
! $result = $this->db->query($query);
! if(DB::isError($result)) $this->sql_error($query,$result);
! return true;
! }
! } else {
! // Use challenge-reponse method
! // Compare pass against md5(user,challenge,hash)
! $hash = $this->db->getOne("select hash from users_users where login='$user'");
! if(!isset($_SESSION["challenge"])) return false;
! //print("pass: $pass user: $user hash: $hash <br/>");
! //print("challenge: ".$_SESSION["challenge"]." challenge: $challenge<br/>");
! if($pass == md5($user.$hash.$_SESSION["challenge"])) {
! $t = date("U");
! $query = "update users_users set currentLogin=$t where login='$user'";
! $result = $this->db->query($query);
! if(DB::isError($result)) $this->sql_error($query,$result);
! return true;
! } else {
! return false;
! }
}
return false;
***************
*** 422,428 ****
function add_user($user,$pass,$email,$provpass='')
{
if($this->user_exists($user)) return false;
$now=date("U");
! $query = "insert into users_users(login,password,email,provpass,registrationDate) values('$user','$pass','$email','$provpass',$now)";
$result = $this->db->query($query);
if(DB::isError($result)) $this->sql_error($query,$result);
--- 463,474 ----
function add_user($user,$pass,$email,$provpass='')
{
+ global $pass_due;
+ $hash = md5($pass);
+ global $feature_clear_passwords;
+ if($feature_clear_passwords == 'n') $pass='';
if($this->user_exists($user)) return false;
$now=date("U");
! $new_pass_due=$now+(60*60*24*$pass_due);
! $query = "insert into users_users(login,password,email,provpass,registrationDate,hash,pass_due,created) values('$user','$pass','$email','$provpass',$now,'$hash',$new_pass_due,$now)";
$result = $this->db->query($query);
if(DB::isError($result)) $this->sql_error($query,$result);
***************
*** 442,445 ****
--- 488,503 ----
$query = "select password from users_users where login='$user'";
$pass = $this->db->getOne($query);
+ return $pass;
+ }
+
+ function renew_user_password($user)
+ {
+ $pass = $this->genPass();
+ $hash = md5($pass);
+ // Note that tiki-generated passwords are due inmediatley
+ $now=date("U");
+ $query = "update users_users set password='$pass', hash='$hash',pass_due=$now where login='$user'";
+ $result = $this->db->query($query);
+ if(DB::isError($result)) $this->sql_error($query,$result);
return $pass;
}
|