[cvs] commit: imp folders.php mailbox.php search.php imp/lib Folder.php IMP.php Mailbox.php Message.php Search.php Session.php VFolder.php base.php prefs.php imp/lib/Auth imp.php imp/lib/IMAP Tree.php imp/templates/mailbox header.inc imp/templates/message ...

[Michael M Slusarz]

slusarz     2006-01-17 20:58:33 PST

  Modified files:        (Branch: FRAMEWORK_3)
    .                    folders.php mailbox.php search.php 
    lib                  Folder.php IMP.php Mailbox.php 
                         Message.php Search.php Session.php 
                         base.php prefs.php 
    lib/Auth             imp.php 
    lib/IMAP             Tree.php 
    templates/mailbox    header.inc 
    templates/message    navbar_actions.inc 
    templates/prefs      defaultsearchselect.inc 
    templates/search     header.inc javascript.inc main.inc 
  Removed files:         (Branch: FRAMEWORK_3)
    lib                  VFolder.php 
  Log:
  MFH: New IMP_Search:: framework.  Since HEAD and FRAMEWORK_3 are significantly
  different in lots of areas, I had to do quite a bit of manual merging -
  hopefully I got everything.
  
  Revision     Changes    Path
  2.309.2.23   +5 -5      imp/folders.php
  1.6.6.13     +0 -350    imp/lib/Attic/VFolder.php (dead)
  1.16.6.11    +19 -22    imp/lib/Auth/imp.php
  1.130.10.22  +7 -13     imp/lib/Folder.php
  1.25.2.23    +5 -7      imp/lib/IMAP/Tree.php
  1.449.4.46   +13 -25    imp/lib/IMP.php
  1.76.10.30   +24 -16    imp/lib/Mailbox.php
  1.164.8.22   +4 -7      imp/lib/Message.php
  1.37.10.12   +522 -72   imp/lib/Search.php
  1.74.2.18    +10 -11    imp/lib/Session.php
  1.79.10.9    +1 -7      imp/lib/base.php
  1.3.10.12    +7 -10     imp/lib/prefs.php
  2.617.4.40   +7 -10     imp/mailbox.php
  2.128.2.10   +31 -38    imp/search.php
  2.77.2.10    +4 -4      imp/templates/mailbox/Attic/header.inc
  2.19.10.4    +1 -1      imp/templates/message/Attic/navbar_actions.inc
  1.1.2.2      +5 -2      imp/templates/prefs/defaultsearchselect.inc
  1.15.10.4    +4 -4      imp/templates/search/Attic/header.inc
  1.66.8.3     +5 -5      imp/templates/search/Attic/main.inc
  1.10.10.2    +1 -1      imp/templates/search/javascript.inc

  Chora Links:
  http://cvs.horde.org/diff.php/imp/folders.php?r1=2.309.2.22&r2=2.309.2.23&ty=u
  http://cvs.horde.org/co.php/imp/lib/Attic/VFolder.php?r=1.6.6.12
  http://cvs.horde.org/diff.php/imp/lib/Auth/imp.php?r1=1.16.6.10&r2=1.16.6.11&ty=u
  http://cvs.horde.org/diff.php/imp/lib/Folder.php?r1=1.130.10.21&r2=1.130.10.22&ty=u
  http://cvs.horde.org/diff.php/imp/lib/IMAP/Tree.php?r1=1.25.2.22&r2=1.25.2.23&ty=u
  http://cvs.horde.org/diff.php/imp/lib/IMP.php?r1=1.449.4.45&r2=1.449.4.46&ty=u
  http://cvs.horde.org/diff.php/imp/lib/Mailbox.php?r1=1.76.10.29&r2=1.76.10.30&ty=u
  http://cvs.horde.org/diff.php/imp/lib/Message.php?r1=1.164.8.21&r2=1.164.8.22&ty=u
  http://cvs.horde.org/diff.php/imp/lib/Search.php?r1=1.37.10.11&r2=1.37.10.12&ty=u
  http://cvs.horde.org/diff.php/imp/lib/Session.php?r1=1.74.2.17&r2=1.74.2.18&ty=u
  http://cvs.horde.org/diff.php/imp/lib/base.php?r1=1.79.10.8&r2=1.79.10.9&ty=u
  http://cvs.horde.org/diff.php/imp/lib/prefs.php?r1=1.3.10.11&r2=1.3.10.12&ty=u
  http://cvs.horde.org/diff.php/imp/mailbox.php?r1=2.617.4.39&r2=2.617.4.40&ty=u
  http://cvs.horde.org/diff.php/imp/search.php?r1=2.128.2.9&r2=2.128.2.10&ty=u
  http://cvs.horde.org/diff.php/imp/templates/mailbox/Attic/header.inc?r1=2.77.2.9&r2=2.77.2.10&ty=u
  http://cvs.horde.org/diff.php/imp/templates/message/Attic/navbar_actions.inc?r1=2.19.10.3&r2=2.19.10.4&ty=u
  http://cvs.horde.org/diff.php/imp/templates/prefs/defaultsearchselect.inc?r1=1.1.2.1&r2=1.1.2.2&ty=u
  http://cvs.horde.org/diff.php/imp/templates/search/Attic/header.inc?r1=1.15.10.3&r2=1.15.10.4&ty=u
  http://cvs.horde.org/diff.php/imp/templates/search/Attic/main.inc?r1=1.66.8.2&r2=1.66.8.3&ty=u
  http://cvs.horde.org/diff.php/imp/templates/search/javascript.inc?r1=1.10.10.1&r2=1.10.10.2&ty=u