[OPT-CVS] opt/documents/Doc_List add_doc.inc,1.8,1.9 edit_doc.inc,1.3,1.4

[<guy...@us...>]

Update of /cvsroot/outreach/opt/documents/Doc_List
In directory sc8-pr-cvs1:/tmp/cvs-serv10749/documents/Doc_List

Modified Files:
	add_doc.inc edit_doc.inc 
Log Message:
Correcting an issue regarding the "force_protocol" setting reported by
Martin Vernooij.  This fix includes all the places this should be have
been an issue.


Index: add_doc.inc
===================================================================
RCS file: /cvsroot/outreach/opt/documents/Doc_List/add_doc.inc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** add_doc.inc	25 Oct 2003 22:51:13 -0000	1.8
--- add_doc.inc	25 Oct 2003 23:14:05 -0000	1.9
***************
*** 9,12 ****
--- 9,13 ----
  
    $proj=abs($proj);
+   $protocol = get_protocol();
  
    // First we have to make sure a project is set.
***************
*** 143,147 ****
              "Please use the URL below in order to access this document:\n".
              "%s"),$name,$obso_email,
!             "\"$p_n\"","$s[1] $s[2] $s[3]","$s[1] $s[3]",$description,"http://$SERVER_NAME:$SERVER_PORT$CRM_URL?URL=".
              rawurlencode("documents/Doc_View/?proj=$proj&doc=$doc")),
              __("You may post comments on this document by replying ".
--- 144,148 ----
              "Please use the URL below in order to access this document:\n".
              "%s"),$name,$obso_email,
!             "\"$p_n\"","$s[1] $s[2] $s[3]","$s[1] $s[3]",$description,"$protocol://$SERVER_NAME:$SERVER_PORT$CRM_URL?URL=".
              rawurlencode("documents/Doc_View/?proj=$proj&doc=$doc")),
              __("You may post comments on this document by replying ".
***************
*** 358,362 ****
              "Please use the URL below in order to access this document:\n".
              "%s"),$name,$obso_email,
!             "\"$p_n\"","$s[1] $s[2] $s[3]","$s[1] $s[3]",$description,"http://$SERVER_NAME:$SERVER_PORT$CRM_URL?URL=".
              rawurlencode("documents/Doc_View/?proj=$proj&doc=$doc")),
              __("You may post comments on this document by replying ".
--- 359,363 ----
              "Please use the URL below in order to access this document:\n".
              "%s"),$name,$obso_email,
!             "\"$p_n\"","$s[1] $s[2] $s[3]","$s[1] $s[3]",$description,"$protocol://$SERVER_NAME:$SERVER_PORT$CRM_URL?URL=".
              rawurlencode("documents/Doc_View/?proj=$proj&doc=$doc")),
              __("You may post comments on this document by replying ".

Index: edit_doc.inc
===================================================================
RCS file: /cvsroot/outreach/opt/documents/Doc_List/edit_doc.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** edit_doc.inc	25 Oct 2003 22:51:13 -0000	1.3
--- edit_doc.inc	25 Oct 2003 23:14:05 -0000	1.4
***************
*** 7,10 ****
--- 7,11 ----
  
    $proj=abs($proj);
+   $protocol = get_protocol();
  
    // First we have to make sure a project is set.
***************
*** 229,233 ****
              "Please use the URL below in order to access this document:\n".
              "%s"),$name,$obso_email,
!             "\"$p_n\"","$s[1] $s[2] $s[3]","$s[1] $s[3]",$description,"http://$SERVER_NAME:$SERVER_PORT$CRM_URL?URL=".
              rawurlencode("documents/Doc_View/?proj=$proj&doc=$doc")),
              __("You may post comments on this document by replying ".
--- 230,234 ----
              "Please use the URL below in order to access this document:\n".
              "%s"),$name,$obso_email,
!             "\"$p_n\"","$s[1] $s[2] $s[3]","$s[1] $s[3]",$description,"$protocol://$SERVER_NAME:$SERVER_PORT$CRM_URL?URL=".
              rawurlencode("documents/Doc_View/?proj=$proj&doc=$doc")),
              __("You may post comments on this document by replying ".