From 77c28206a14b5bee3f3091f10cffd531bce5649c Mon Sep 17 00:00:00 2001 From: yllar <yllar.pajus@gmail.com> Date: Sat, 16 Dec 2006 13:25:16 -0500 Subject: [PATCH] updated ja and fr translations --- program/lib/imap.inc | 171 +++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 118 insertions(+), 53 deletions(-) diff --git a/program/lib/imap.inc b/program/lib/imap.inc index daacb03..6bc47a1 100644 --- a/program/lib/imap.inc +++ b/program/lib/imap.inc @@ -23,8 +23,35 @@ Function containing "_C_" in name require connection handler to be passed as one of the parameters. To obtain connection handler, use iil_Connect() + VERSION: + IlohaMail-0.9-20050415 + CHANGES: + File altered by Thomas Bruederli <roundcube@gmail.com> + to fit enhanced equirements by the RoundCube Webmail: + - Added list of server capabilites and check these before invoking commands + - Added junk flag to iilBasicHeader + - Enhanced error reporting on fsockopen() + - Additional parameter for SORT command + - Removed Call-time pass-by-reference because deprecated + - Parse charset from content-type in iil_C_FetchHeaders() + - Enhanced heaer sorting + - Pass message as reference in iil_C_Append (to save memory) + - Added BCC and REFERENCE to the list of headers to fetch in iil_C_FetchHeaders() + - Leave messageID unchanged in iil_C_FetchHeaders() + - Avoid stripslahes in iil_Connect() + - Escape quotes and backslashes in iil_C_Login() + - Added patch to iil_SortHeaders() by Richard Green + - Removed <br> from error messages (better for logging) + - Added patch to iil_C_Sort() enabling UID SORT commands + - Added function iil_C_ID2UID() + - Casting date parts in iil_StrToTime() to avoid mktime() warnings + - Also acceppt LIST responses in iil_C_ListSubscribed() + - Sanity check of $message_set in iil_C_FetchHeaders(), iil_C_FetchHeaderIndex(), iil_C_FetchThreadHeaders() + - Implemented UID FETCH in iil_C_FetchHeaders() + - Removed some debuggers (echo ...) ********************************************************/ + // changed path to work within roundcube webmail include_once("lib/icl_commons.inc"); @@ -191,7 +218,7 @@ $conn->errorNum = 0; return $conn->fp; }else{ - $conn->error .= 'Authentication failed (AUTH): <br>"'.htmlspecialchars($line)."\""; + $conn->error .= 'Authentication for '.$user.' failed (AUTH): "'.htmlspecialchars($line)."\""; $conn->errorNum = -2; return false; } @@ -199,8 +226,9 @@ function iil_C_Login(&$conn, $user, $password){ + $password = strtr($password, array('"'=>'\\"', '\\' => '\\\\')); fputs($conn->fp, "a001 LOGIN $user \"$password\"\r\n"); - + do{ $line = iil_ReadReply($conn->fp); }while(!iil_StartsWith($line, "a001 ")); @@ -212,7 +240,7 @@ }else{ $result=false; fclose($conn->fp); - $conn->error .= 'Authentication failed (LOGIN):<br>"'.htmlspecialchars($line)."\""; + $conn->error .= 'Authentication for '.$user.' failed (LOGIN): "'.htmlspecialchars($line)."\""; $conn->errorNum = -2; } return $result; @@ -287,8 +315,8 @@ $iil_errornum = 0; //strip slashes - $user = stripslashes($user); - $password = stripslashes($password); + // $user = stripslashes($user); + // $password = stripslashes($password); //set auth method $auth_method = "plain"; @@ -317,9 +345,9 @@ //echo '<!-- conn sort_field: '.$my_prefs['sort_field'].' //-->'; //check input - if (empty($host)) $iil_error .= "Invalid host<br>\n"; - if (empty($user)) $iil_error .= "Invalid user<br>\n"; - if (empty($password)) $iil_error .= "Invalid password<br>\n"; + if (empty($host)) $iil_error .= "Invalid host\n"; + if (empty($user)) $iil_error .= "Invalid user\n"; + if (empty($password)) $iil_error .= "Invalid password\n"; if (!empty($iil_error)) return false; if (!$ICL_PORT) $ICL_PORT = 143; @@ -591,15 +619,15 @@ //$month_a=array("Jan"=>1,"Feb"=>2,"Mar"=>3,"Apr"=>4,"May"=>5,"Jun"=>6,"Jul"=>7,"Aug"=>8,"Sep"=>9,"Oct"=>10,"Nov"=>11,"Dec"=>12); $month_str=$a[1]; $month=$IMAP_MONTHS[$month_str]; - $day=$a[0]; - $year=$a[2]; + $day=(int)$a[0]; + $year=(int)$a[2]; $time=$a[3]; $tz_str = $a[4]; $tz = substr($tz_str, 0, 3); - $ta=explode(":",$time); + $ta = explode(":",$time); $hour=(int)$ta[0]-(int)$tz; - $minute=$ta[1]; - $second=$ta[2]; + $minute=(int)$ta[1]; + $second=(int)$ta[2]; //make UNIX timestamp $time2 = mktime($hour, $minute, $second, $month, $day, $year); @@ -607,7 +635,7 @@ return $time2; } -function iil_C_Sort(&$conn, $mailbox, $field, $add=''){ +function iil_C_Sort(&$conn, $mailbox, $field, $add='', $is_uid=FALSE, $encoding='US-ASCII'){ /* Do "SELECT" command */ if (!iil_C_Select($conn, $mailbox)) return false; @@ -615,11 +643,16 @@ if ($field=='INTERNALDATE') $field='ARRIVAL'; $fields = array('ARRIVAL'=>1,'CC'=>1,'DATE'=>1,'FROM'=>1,'SIZE'=>1,'SUBJECT'=>1,'TO'=>1); - if (!$fields[$field]) return false; + if (!$fields[$field]) + return false; + $is_uid = $is_uid ? 'UID ' : ''; + + if (!empty($add)) + $add = " $add"; + $fp = $conn->fp; - $command = 's SORT ('.$field.') US-ASCII ALL '."$add\r\n"; - //$command = 's SORT ('.$field.') US-ASCII ALL UNDELETED'."\r\n"; + $command = 's '. $is_uid .'SORT ('.$field.') '.$encoding.' ALL'."$add\r\n"; $line = $data = ''; if (!fputs($fp, $command)) return false; @@ -637,7 +670,7 @@ return $out; } -function iil_C_FetchHeaderIndex(&$conn, $mailbox, $message_set, $index_field,$normalize=true){ +function iil_C_FetchHeaderIndex(&$conn, $mailbox, $message_set, $index_field, $normalize=true){ global $IMAP_USE_INTERNAL_DATE; $c=0; @@ -647,7 +680,9 @@ if (empty($index_field)) $index_field="DATE"; $index_field = strtoupper($index_field); - if (empty($message_set)) return array(); + list($from_idx, $to_idx) = explode(':', $message_set); + if (empty($message_set) || (isset($to_idx) && (int)$from_idx > (int)$to_idx)) + return false; //$fields_a["DATE"] = ($IMAP_USE_INTERNAL_DATE?6:1); $fields_a['DATE'] = 1; @@ -903,7 +938,9 @@ global $clock; global $index_a; - if (empty($message_set)) return false; + list($from_idx, $to_idx) = explode(':', $message_set); + if (empty($message_set) || (isset($to_idx) && (int)$from_idx > (int)$to_idx)) + return false; $result = array(); $uids = iil_C_FetchUIDs($conn, $mailbox); @@ -984,7 +1021,9 @@ function iil_C_BuildThreads2(&$conn, $mailbox, $message_set, &$clock){ global $index_a; - if (empty($message_set)) return false; + list($from_idx, $to_idx) = explode(':', $message_set); + if (empty($message_set) || (isset($to_idx) && (int)$from_idx > (int)$to_idx)) + return false; $result=array(); $roots=array(); @@ -1159,15 +1198,17 @@ return $t_index; } -function iil_C_FetchHeaders(&$conn, $mailbox, $message_set){ +function iil_C_FetchHeaders(&$conn, $mailbox, $message_set, $uidfetch=false){ global $IMAP_USE_INTERNAL_DATE; $c=0; $result=array(); $fp = $conn->fp; - if (empty($message_set)) return array(); - + list($from_idx, $to_idx) = explode(':', $message_set); + if (empty($message_set) || (isset($to_idx) && (int)$from_idx > (int)$to_idx)) + return false; + /* Do "SELECT" command */ if (!iil_C_Select($conn, $mailbox)){ $conn->error = "Couldn't select $mailbox"; @@ -1193,9 +1234,8 @@ /* FETCH date,from,subject headers */ $key="fh".($c++); - $request=$key." FETCH $message_set (BODY.PEEK[HEADER.FIELDS (DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID)])\r\n"; - - // echo "// $request\n\n"; + $prefix=$uidfetch?" UID":""; + $request=$key.$prefix." FETCH $message_set (BODY.PEEK[HEADER.FIELDS (DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC BCC CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID REFERENCE)])\r\n"; if (!fputs($fp, $request)) return false; do{ @@ -1246,9 +1286,11 @@ $result[$id]->subject = str_replace("\n", "", $headers["subject"]); $result[$id]->replyto = str_replace("\n", " ", $headers["reply-to"]); $result[$id]->cc = str_replace("\n", " ", $headers["cc"]); + $result[$id]->bcc = str_replace("\n", " ", $headers["bcc"]); $result[$id]->encoding = str_replace("\n", " ", $headers["content-transfer-encoding"]); $result[$id]->ctype = str_replace("\n", " ", $headers["content-type"]); $result[$id]->in_reply_to = ereg_replace("[\n<>]",'', $headers['in-reply-to']); + $result[$id]->reference = $headers["reference"]; list($result[$id]->ctype, $ctype_add) = explode(";", $headers["content-type"]); @@ -1256,8 +1298,7 @@ $result[$id]->charset = $regs[1]; $messageID = $headers["message-id"]; - if ($messageID) $messageID = substr(substr($messageID, 1), 0, strlen($messageID)-2); - else $messageID = "mid:".$id; + if (!$messageID) "mid:".$id; $result[$id]->messageID = $messageID; } else { @@ -1272,7 +1313,7 @@ Sample reply line: "* 3 FETCH (UID 2417 RFC822.SIZE 2730 FLAGS (\Seen \Deleted))" */ $command_key="fh".($c++); - $request= $command_key." FETCH $message_set (UID RFC822.SIZE FLAGS INTERNALDATE)\r\n"; + $request= $command_key.$prefix." FETCH $message_set (UID RFC822.SIZE FLAGS INTERNALDATE)\r\n"; if (!fputs($fp, $request)) return false; do{ $line=chop(iil_ReadLine($fp, 200)); @@ -1364,10 +1405,10 @@ } -function iil_C_FetchHeader(&$conn, $mailbox, $id){ +function iil_C_FetchHeader(&$conn, $mailbox, $id, $uidfetch=false){ $fp = $conn->fp; - $a=iil_C_FetchHeaders($conn, $mailbox, $id); - if (is_array($a)) return $a[$id]; + $a=iil_C_FetchHeaders($conn, $mailbox, $id, $uidfetch); + if (is_array($a)) return array_shift($a); else return false; } @@ -1379,7 +1420,7 @@ if (empty($flag)) $flag="ASC"; $flag=strtoupper($flag); $stripArr = ($field=='subject') ? array('Re: ','Fwd: ','Fw: ',"\"") : array("\""); - + $c=count($a); if ($c>0){ /* @@ -1389,12 +1430,22 @@ and use that to sort the main array. */ - // create "index" array + // create "index" array $index=array(); reset($a); while (list($key, $val)=each($a)){ - $data=$a[$key]->$field; - if (is_string($data)) $data=strtoupper(str_replace($stripArr, "", $data)); + + if ($field=="timestamp"){ + $data = @strtotime($val->date); + if ($data == false) + $data = $val->timestamp; + } + else { + $data = $val->$field; + if (is_string($data)) + $data=strtoupper(str_replace($stripArr, "", $data)); + } + $index[$key]=$data; } @@ -1542,6 +1593,25 @@ return false; } +function iil_C_ID2UID(&$conn, $folder, $id){ + $fp = $conn->fp; + $result=-1; + if ($id > 0) { + if (iil_C_Select($conn, $folder)){ + $key = "FUID"; + if (fputs($fp, "$key FETCH $id (UID)\r\n")){ + do{ + $line=chop(iil_ReadLine($fp, 1024)); + if (eregi("^\* $id FETCH \(UID (.*)\)", $line, $r)){ + $result = $r[1]; + } + } while (!preg_match("/^$key/", $line)); + } + } + } + return $result; +} + function iil_C_Search(&$conn, $folder, $criteria){ $fp = $conn->fp; if (iil_C_Select($conn, $folder)){ @@ -1560,12 +1630,12 @@ $result_code=iil_ParseResult($line); if ($result_code==0) return $messages; else{ - $conn->error = "iil_C_Search: ".$line."<br>\n"; + $conn->error = "iil_C_Search: ".$line."\n"; return false; } }else{ - $conn->error = "iil_C_Search: Couldn't select \"$folder\" <br>\n"; + $conn->error = "iil_C_Search: Couldn't select \"$folder\"\n"; return false; } } @@ -1699,7 +1769,7 @@ $line=iil_ReadLine($fp, 500); $line=iil_MultLine($fp, $line); $a = explode(" ", $line); - if (($line[0]=="*") && ($a[1]=="LSUB")){ + if (($line[0]=="*") && ($a[1]=="LSUB" || $a[1]=="LIST")){ $line = rtrim($line); // split one line $a=iil_ExplodeQuotedString(" ", $line); @@ -1819,7 +1889,7 @@ $remaining = $bytes - $received; $line = iil_ReadLine($fp, 1024); $len = strlen($line); - if ($len > $remaining) substr($line, 0, $remaining); + if ($len > $remaining) $line = substr($line, 0, $remaining); $received += strlen($line); if ($mode==1) $result .= chop($line)."\n"; else if ($mode==2){ echo chop($line)."\n"; flush(); } @@ -1904,24 +1974,20 @@ if (!$len) return false; $request="A APPEND \"".$folder."\" (\\Seen) {".$len."}\r\n"; - // echo $request.'<br>'; if (fputs($fp, $request)){ - $line=iil_ReadLine($fp, 100); - // echo $line.'<br>'; - + $line=iil_ReadLine($fp, 100); $sent = fwrite($fp, $message."\r\n"); flush(); do{ $line=iil_ReadLine($fp, 1000); - //echo $line.'<br>'; }while($line[0]!="A"); $result = (iil_ParseResult($line)==0); - if (!$result) $conn->error .= $line."<br>\n"; + if (!$result) $conn->error .= $line."\n"; return $result; }else{ - $conn->error .= "Couldn't send command \"$request\"<br>\n"; + $conn->error .= "Couldn't send command \"$request\"\n"; return false; } } @@ -1934,7 +2000,7 @@ $in_fp = false; if (file_exists(realpath($path))) $in_fp = fopen($path, "r"); if (!$in_fp){ - $conn->error .= "Couldn't open $path for reading<br>\n"; + $conn->error .= "Couldn't open $path for reading\n"; return false; } @@ -1961,15 +2027,14 @@ //read response do{ $line=iil_ReadLine($fp, 1000); - //echo $line.'<br>'; }while($line[0]!="A"); $result = (iil_ParseResult($line)==0); - if (!$result) $conn->error .= $line."<br>\n"; + if (!$result) $conn->error .= $line."\n"; return $result; }else{ - $conn->error .= "Couldn't send command \"$request\"<br>\n"; + $conn->error .= "Couldn't send command \"$request\"\n"; return false; } } @@ -2056,4 +2121,4 @@ return (iil_C_Expunge($conn, $folder) >= 0); } -?> \ No newline at end of file +?> -- Gitblit v1.9.1