<div dir="ltr">Am not happy with it going in unless it's been tested somewhere else to be honest. <div>I think the code needs a look over as the logic seems weird</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">
On Tue, Nov 26, 2013 at 11:52 PM, Tom Reijnders <span dir="ltr"><<a href="mailto:reijnders@tor.nl" target="_blank">reijnders@tor.nl</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

  
    
  
  <div text="#000000" bgcolor="#FFFFFF">
    Why in the 2.2 branch? I would think either in a hotfix branch (if
    you want to include it in 2.1) or in develop.<br>
    <br>
    Tom<br>
    <br>
    <div>Julian Tenney schreef op 26-11-2013
      16:15:<br>
    </div>
    <blockquote type="cite"><div><div class="h5">
      
      
      
      <div>
        <p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d">I
            will create a 2.2 branch from develop and commit these files
            to it,<u></u><u></u></span></p>
        <p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d"><u></u> <u></u></span></p>
        <p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d">Thanks,<u></u><u></u></span></p>
        <p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d"><u></u> <u></u></span></p>
        <p class="MsoNormal"><b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"" lang="EN-US">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"" lang="EN-US"> <a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a>
            [<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">mailto:xerte-dev-bounces@lists.nottingham.ac.uk</a>] <b>On
              Behalf Of </b>Pat @ Pgogy<br>
            <b>Sent:</b> 26 November 2013 15:07<br>
            <b>To:</b> For Xerte technical developers<br>
            <b>Subject:</b> [Xerte-dev] Re: Fwd: Two LDAPs<u></u><u></u></span></p>
        <p class="MsoNormal"><u></u> <u></u></p>
        <div>
          <p class="MsoNormal">I think adding this to
            library/xerte/authentication fixes it<u></u><u></u></p>
        </div>
        <div>
          <p class="MsoNormal" style="margin-bottom:12.0pt"><u></u> <u></u></p>
          <div>
            <p class="MsoNormal">On Tue, Nov 26, 2013 at 2:10 PM, Julian
              Tenney <<a href="mailto:Julian.Tenney@nottingham.ac.uk" target="_blank">Julian.Tenney@nottingham.ac.uk</a>>
              wrote:<u></u><u></u></p>
            <div>
              <div>
                <p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d">Sounds
                    like Thomas can help?</span><u></u><u></u></p>
                <p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d"> </span><u></u><u></u></p>
                <p class="MsoNormal"><b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"" lang="EN-US">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"" lang="EN-US"> <a href="mailto:patrick.lockley@googlemail.com" target="_blank">patrick.lockley@googlemail.com</a>
                    [mailto:<a href="mailto:patrick.lockley@googlemail.com" target="_blank">patrick.lockley@googlemail.com</a>]
                    <b>On Behalf Of </b>Pat @ Pgogy<br>
                    <b>Sent:</b> 26 November 2013 13:59<br>
                    <b>To:</b> Julian Tenney<br>
                    <b>Cc:</b> <a href="mailto:xerte@pgogywebstuff.com" target="_blank">xerte@pgogywebstuff.com</a>; For
                    Xerte technical developers<br>
                    <b>Subject:</b> Re: [Xerte-dev] Re: Fwd: Two LDAPs</span><u></u><u></u></p>
                <div>
                  <div>
                    <p class="MsoNormal"> <u></u><u></u></p>
                    <div>
                      <p class="MsoNormal">i
                        assume it stopped working when the LDAP library
                        was created<u></u><u></u></p>
                    </div>
                    <div>
                      <p class="MsoNormal" style="margin-bottom:12.0pt"> <u></u><u></u></p>
                      <div>
                        <p class="MsoNormal">On
                          Tue, Nov 26, 2013 at 1:07 PM, Julian Tenney
                          <<a href="mailto:Julian.Tenney@nottingham.ac.uk" target="_blank">Julian.Tenney@nottingham.ac.uk</a>>
                          wrote:<u></u><u></u></p>
                        <div>
                          <div>
                            <p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d">Did
                                it work previously?</span><u></u><u></u></p>
                            <p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d"> </span><u></u><u></u></p>
                            <p class="MsoNormal"><b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"" lang="EN-US">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"" lang="EN-US"> <a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a>
                                [mailto:<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk" target="_blank">xerte-dev-bounces@lists.nottingham.ac.uk</a>]
                                <b>On Behalf Of </b>Pat @ Pgogy<br>
                                <b>Sent:</b> 26 November 2013 12:00</span><u></u><u></u></p>
                            <div>
                              <p class="MsoNormal"><br>
                                <b>To:</b> For Xerte technical
                                developers<u></u><u></u></p>
                            </div>
                            <p class="MsoNormal"><b>Subject:</b>
                              [Xerte-dev] Re: Fwd: Two LDAPs<u></u><u></u></p>
                            <div>
                              <div>
                                <p class="MsoNormal"> <u></u><u></u></p>
                                <div>
                                  <p class="MsoNormal">As
                                    far as I can tell at present, the
                                    2.1 code as it won't work with more
                                    than one LDAP, but I have no
                                    possibility of testing<u></u><u></u></p>
                                  <div>
                                    <p class="MsoNormal"> <u></u><u></u></p>
                                  </div>
                                  <div>
                                    <p class="MsoNormal">(for
                                      ref spent ages yesterday fixing
                                      Adam Marjon's LDAP - mostly off
                                      list)<u></u><u></u></p>
                                  </div>
                                </div>
                                <div>
                                  <p class="MsoNormal" style="margin-bottom:12.0pt"> <u></u><u></u></p>
                                  <div>
                                    <p class="MsoNormal">On
                                      Tue, Nov 26, 2013 at 11:08 AM,
                                      <<a href="mailto:thomas.rochford@jiscadvance.ac.uk" target="_blank">thomas.rochford@jiscadvance.ac.uk</a>>
                                      wrote:<u></u><u></u></p>
                                    <div>
                                      <div>
                                        <div>
                                          <p class="MsoNormal"><span style="font-family:"Calibri","sans-serif"">Hi Pat,</span><u></u><u></u></p>
                                        </div>
                                        <div>
                                          <p class="MsoNormal"><span style="font-family:"Calibri","sans-serif""> </span><u></u><u></u></p>
                                        </div>
                                        <div>
                                          <p class="MsoNormal"><span style="font-family:"Calibri","sans-serif"">Yes
                                              indeed. I’ve had big
                                              problems at Lowestoft
                                              college where they have
                                              three LDAPS! One for  IT
                                              Staff, another for All
                                              other staff and the third
                                              for students. Quite a few
                                              colleges have separate
                                              domains for staff and
                                              students as well.</span><u></u><u></u></p>
                                        </div>
                                        <div>
                                          <div>
                                            <p class="MsoNormal"><span style="font-family:"Calibri","sans-serif""> </span><u></u><u></u></p>
                                          </div>
                                          <div>
                                            <p class="MsoNormal"><span style="font-family:"Calibri","sans-serif"">Kindest
                                                Regards,<br>
                                                Thomas<br>
==========================================================<br>
                                                Thomas Rochford  | 
                                                e-Learning Advisor  | 
                                                Jisc RSC Eastern<br>
                                                Tel: 01223 564749 | 
                                                Mobile: 07500 669002  | 
                                                Skype:
                                                cambridge.serendipity<br>
                                                Email: <a href="mailto:thomas.rochford@jiscadvance.ac.uk" target="_blank">thomas.rochford@jiscadvance.ac.uk</a> 
                                                |  Web: <a href="http://www.jiscrsc.ac.uk/eastern" target="_blank">http://www.jiscrsc.ac.uk/eastern</a>
                                                <br>
                                                Cambridge Serendipity,
                                                35 Gough Way, Cambridge,
                                                CB3 9LN<br>
                                                For the full range of
                                                RSC UK events, resources
                                                and blog, visit <a href="http://www.jiscrsc.ac.uk" target="_blank">http://www.jiscrsc.ac.uk</a></span><u></u><u></u></p>
                                          </div>
                                          <div>
                                            <p class="MsoNormal"><span style="font-family:"Calibri","sans-serif""> </span><u></u><u></u></p>
                                          </div>
                                        </div>
                                        <div style="border:none;border-top:solid #e5e5e5 1.0pt;padding:4.0pt 0cm 0cm 0cm">
                                          <div>
                                            <p class="MsoNormal"><b><span style="font-family:"Calibri","sans-serif";letter-spacing:.25pt">From:</span></b><span style="font-family:"Calibri","sans-serif";letter-spacing:.25pt"> <a href="mailto:xerte@pgogywebstuff.com" target="_blank">Pat @ Pgogy</a><br>

                                                <b>Sent:</b> Monday, 25
                                                November 2013 15:57<br>
                                                <b>To:</b> <a href="mailto:xerte-dev@lists.nottingham.ac.uk" target="_blank">For Xerte
                                                  technical developers</a></span><u></u><u></u></p>
                                          </div>
                                        </div>
                                        <div>
                                          <div>
                                            <div>
                                              <p class="MsoNormal"><span style="font-family:"Calibri","sans-serif""> </span><u></u><u></u></p>
                                            </div>
                                            <div>
                                              <div>
                                                <div>
                                                  <div>
                                                    <div>
                                                      <p class="MsoNormal"><span style="font-family:"Calibri","sans-serif"">hello </span><u></u><u></u></p>
                                                    </div>
                                                    <div>
                                                      <p class="MsoNormal"><span style="font-family:"Calibri","sans-serif""> </span><u></u><u></u></p>
                                                    </div>
                                                    <div>
                                                      <p class="MsoNormal"><span style="font-family:"Calibri","sans-serif"">Is
                                                          anyone
                                                          auth'ing to
                                                          two LDAPs?</span><u></u><u></u></p>
                                                    </div>
                                                    <div>
                                                      <p class="MsoNormal"><span style="font-family:"Calibri","sans-serif""> </span><u></u><u></u></p>
                                                    </div>
                                                    <div>
                                                      <p class="MsoNormal"><span style="font-family:"Calibri","sans-serif"">I
                                                          think I've
                                                          found a bug,
                                                          but need to
                                                          test</span><u></u><u></u></p>
                                                    </div>
                                                    <div>
                                                      <p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:#888888"> </span><u></u><u></u></p>
                                                    </div>
                                                    <div>
                                                      <p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:#888888">Pat</span><u></u><u></u></p>
                                                    </div>
                                                  </div>
                                                </div>
                                                <p class="MsoNormal"><span style="font-family:"Calibri","sans-serif""> </span><u></u><u></u></p>
                                              </div>
                                            </div>
                                          </div>
                                        </div>
                                      </div>
                                    </div>
                                  </div>
                                  <p class="MsoNormal"> <u></u><u></u></p>
                                </div>
                              </div>
                            </div>
                          </div>
                          <p class="MsoNormal"> <u></u><u></u></p>
                          <p>This message and any attachment are
                            intended solely for the addressee and may
                            contain confidential information. If you
                            have received this message in error, please
                            send it back to me, and immediately delete
                            it.   Please do not use, copy or disclose
                            the information contained in this message or
                            in any attachment.  Any views or opinions
                            expressed by the author of this email do not
                            necessarily reflect the views of the
                            University of Nottingham.<u></u><u></u></p>
                          <p>This message has been checked for viruses
                            but the contents of an attachment may still
                            contain software viruses which could damage
                            your computer system, you are advised to
                            perform your own checks. Email
                            communications with the University of
                            Nottingham may be monitored as permitted by
                            UK legislation.<u></u><u></u></p>
                          <p class="MsoNormal"> <u></u><u></u></p>
                        </div>
                      </div>
                      <p class="MsoNormal"> <u></u><u></u></p>
                    </div>
                  </div>
                </div>
              </div>
            </div>
            <div>
              <div>
                <p class="MsoNormal"><u></u> <u></u></p>
                <p>This message and any attachment are intended solely
                  for the addressee and may contain confidential
                  information. If you have received this message in
                  error, please send it back to me, and immediately
                  delete it.   Please do not use, copy or disclose the
                  information contained in this message or in any
                  attachment.  Any views or opinions expressed by the
                  author of this email do not necessarily reflect the
                  views of the University of Nottingham.<u></u><u></u></p>
                <p>This message has been checked for viruses but the
                  contents of an attachment may still contain software
                  viruses which could damage your computer system, you
                  are advised to perform your own checks. Email
                  communications with the University of Nottingham may
                  be monitored as permitted by UK legislation.<u></u><u></u></p>
                <p class="MsoNormal"><u></u> <u></u></p>
              </div>
            </div>
          </div>
          <p class="MsoNormal"><u></u> <u></u></p>
        </div>
      </div>
      <br>
      <p>This message and any attachment are intended solely for the
        addressee and may contain confidential information. If you have
        received this message in error, please send it back to me, and
        immediately delete it.   Please do not use, copy or disclose the
        information contained in this message or in any attachment.  Any
        views or opinions expressed by the author of this email do not
        necessarily reflect the views of the University of Nottingham.</p>
      <p>This message has been checked for viruses but the contents of
        an attachment may still contain software viruses which could
        damage your computer system, you are advised to perform your own
        checks. Email communications with the University of Nottingham
        may be monitored as permitted by UK legislation.</p>
      <br>
      <br>
      <fieldset></fieldset>
      <br>
      </div></div><div class="im"><pre>_______________________________________________
Xerte-dev mailing list
<a href="mailto:Xerte-dev@lists.nottingham.ac.uk" target="_blank">Xerte-dev@lists.nottingham.ac.uk</a>
<a href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev" target="_blank">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a>
</pre>
    </div></blockquote><span class="HOEnZb"><font color="#888888">
    <br>
    <pre cols="72">-- 
--

Tom Reijnders
TOR Informatica
Chopinlaan 27
5242HM Rosmalen
Tel: 073 5226191
Fax: 073 5226196

</pre></font></span><div class="im">
  
<br>
<p>This message and any attachment are intended solely for the addressee and may contain confidential information. If you have received this message in error, please send it back to me, and immediately delete it.   Please do not use, copy or disclose the information contained in this message or in any attachment.  Any views or opinions expressed by the author of this email do not necessarily reflect the views of the University of Nottingham.</p>
<p>This message has been checked for viruses but the contents of an attachment may still contain software viruses which could damage your computer system, you are advised to perform your own checks. Email communications with the University of Nottingham may be monitored as permitted by UK legislation.</p>
<br>
</div></div>

<br>_______________________________________________<br>
Xerte-dev mailing list<br>
<a href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a><br>
<a href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev" target="_blank">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a><br>
<br></blockquote></div><br></div>