[Tikiwiki-cvs] tiki comments.php,1.4,1.5 tiki-admin_poll_options.php,1.4,1.5 tiki-articles_rss.php,1.5,1.6 tiki-blog_rss.php,1.4,1.5 tiki-blogs_rss.php,1.3,1.4 tiki-file_galleries_rss.php,1.3,1.4 tiki-file_gallery_rss.php,1.3,1.4 tiki-forum_rss.php,1.2,1.3 tiki-forums_rss.php,1.2,1.3 tiki-image_galleries_rss.php,1.3,1.4 tiki-image_gallery_rss.php,1.3,1.4 tiki-poll_form.php,1.2,1.3 tiki-register.php,1.8,1.9 tiki-setup.php,1.14,1.15 tiki-view_banner.php,1.4,1.5 tiki-wiki_rss.php,1.4,1.5 xmlrpc.php,1.6,1.7

[<ro...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs1:/tmp/cvs-serv13032

Modified Files:
	comments.php tiki-admin_poll_options.php tiki-articles_rss.php 
	tiki-blog_rss.php tiki-blogs_rss.php 
	tiki-file_galleries_rss.php tiki-file_gallery_rss.php 
	tiki-forum_rss.php tiki-forums_rss.php 
	tiki-image_galleries_rss.php tiki-image_gallery_rss.php 
	tiki-poll_form.php tiki-register.php tiki-setup.php 
	tiki-view_banner.php tiki-wiki_rss.php xmlrpc.php 
Log Message:
Per
http://sourceforge.net/tracker/index.php?func=detail&aid=653666&group_id=64258&atid=506846
tiki will now run on a non-standard SERVER_PORT (not 80 or 443).
Again, I've made very minor changes to many different files, and I haven't tested *every* file.
Please let me know if something isn't working.


Index: comments.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/comments.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** comments.php	22 Dec 2002 08:23:43 -0000	1.4
--- comments.php	22 Dec 2002 08:42:51 -0000	1.5
***************
*** 48,52 ****
  }
  parse_str($comments_parsed["query"],$comments_query);
! $comments_father=httpScheme().'://'.$comments_server.$comments_parsed["path"];
  $comments_complete_father = $comments_father;
  
--- 48,52 ----
  }
  parse_str($comments_parsed["query"],$comments_query);
! $comments_father=httpPrefix().$comments_parsed["path"];
  $comments_complete_father = $comments_father;
  

Index: tiki-admin_poll_options.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_poll_options.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tiki-admin_poll_options.php	22 Dec 2002 08:23:44 -0000	1.4
--- tiki-admin_poll_options.php	22 Dec 2002 08:42:51 -0000	1.5
***************
*** 81,85 ****
    $smarty->assign('prev_offset',-1); 
  }
! $smarty->assign('ownurl',httpScheme().'://'.$_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"]);
  $smarty->assign_by_ref('channels',$channels["data"]);
  
--- 81,85 ----
    $smarty->assign('prev_offset',-1); 
  }
! $smarty->assign('ownurl',httpPrefix().$_SERVER["REQUEST_URI"]);
  $smarty->assign_by_ref('channels',$channels["data"]);
  

Index: tiki-articles_rss.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-articles_rss.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tiki-articles_rss.php	22 Dec 2002 08:23:44 -0000	1.5
--- tiki-articles_rss.php	22 Dec 2002 08:42:51 -0000	1.6
***************
*** 11,17 ****
  $foo2=str_replace("tiki-articles_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-articles_rss","tiki-read_article.php",$foo["path"]);
! $home = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo1;
! $img = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo2;
! $read = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo3;
  //$title = $tikilib->get_preference("title","Tiki RSS feedpepe");
  $now = date("U");
--- 11,17 ----
  $foo2=str_replace("tiki-articles_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-articles_rss","tiki-read_article.php",$foo["path"]);
! $home = httpPrefix().$foo1;
! $img = httpPrefix().$foo2;
! $read = httpPrefix().$foo3;
  //$title = $tikilib->get_preference("title","Tiki RSS feedpepe");
  $now = date("U");

Index: tiki-blog_rss.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-blog_rss.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tiki-blog_rss.php	22 Dec 2002 08:23:44 -0000	1.4
--- tiki-blog_rss.php	22 Dec 2002 08:42:51 -0000	1.5
***************
*** 14,20 ****
  $foo2=str_replace("tiki-blog_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-blog_rss","tiki-view_blog",$foo["path"]);
! $home = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo1;
! $img = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo2;
! $read = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo3;
  $title = $tikilib->get_preference("title","pepe");
  $now = date("U");
--- 14,20 ----
  $foo2=str_replace("tiki-blog_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-blog_rss","tiki-view_blog",$foo["path"]);
! $home = httpPrefix().$foo1;
! $img = httpPrefix().$foo2;
! $read = httpPrefix().$foo3;
  $title = $tikilib->get_preference("title","pepe");
  $now = date("U");

Index: tiki-blogs_rss.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-blogs_rss.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tiki-blogs_rss.php	22 Dec 2002 08:23:44 -0000	1.3
--- tiki-blogs_rss.php	22 Dec 2002 08:42:51 -0000	1.4
***************
*** 11,17 ****
  $foo2=str_replace("tiki-blogs_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-blogs_rss","tiki-view_blog.php",$foo["path"]);
! $home = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo1;
! $img = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo2;
! $read = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo3;
  
  $now = date("U");
--- 11,17 ----
  $foo2=str_replace("tiki-blogs_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-blogs_rss","tiki-view_blog.php",$foo["path"]);
! $home = httpPrefix().$foo1;
! $img = httpPrefix().$foo2;
! $read = httpPrefix().$foo3;
  
  $now = date("U");

Index: tiki-file_galleries_rss.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-file_galleries_rss.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tiki-file_galleries_rss.php	22 Dec 2002 08:23:44 -0000	1.3
--- tiki-file_galleries_rss.php	22 Dec 2002 08:42:52 -0000	1.4
***************
*** 11,17 ****
  $foo2=str_replace("tiki-file_galleries_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-file_galleries_rss","tiki-download_file.php",$foo["path"]);
! $home = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo1;
! $img = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo2;
! $read = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo3;
  $title = $tikilib->get_preference("title","Tiki RSS feed for file galleries");
  $now = date("U");
--- 11,17 ----
  $foo2=str_replace("tiki-file_galleries_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-file_galleries_rss","tiki-download_file.php",$foo["path"]);
! $home = httpPrefix().$foo1;
! $img = httpPrefix().$foo2;
! $read = httpPrefix().$foo3;
  $title = $tikilib->get_preference("title","Tiki RSS feed for file galleries");
  $now = date("U");

Index: tiki-file_gallery_rss.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-file_gallery_rss.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tiki-file_gallery_rss.php	22 Dec 2002 08:23:44 -0000	1.3
--- tiki-file_gallery_rss.php	22 Dec 2002 08:42:52 -0000	1.4
***************
*** 14,20 ****
  $foo2=str_replace("tiki-file_gallery_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-file_gallery_rss","tiki-download_file",$foo["path"]);
! $home = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo1;
! $img = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo2;
! $read = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo3;
  
  $now = date("U");
--- 14,20 ----
  $foo2=str_replace("tiki-file_gallery_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-file_gallery_rss","tiki-download_file",$foo["path"]);
! $home = httpPrefix().$foo1;
! $img = httpPrefix().$foo2;
! $read = httpPrefix().$foo3;
  
  $now = date("U");

Index: tiki-forum_rss.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-forum_rss.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tiki-forum_rss.php	22 Dec 2002 08:23:44 -0000	1.2
--- tiki-forum_rss.php	22 Dec 2002 08:42:52 -0000	1.3
***************
*** 15,21 ****
  $foo2=str_replace("tiki-forum_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-forum_rss","tiki-view_forum_thread",$foo["path"]);
! $home = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo1;
! $img = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo2;
! $read = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo3;
  
  $now = date("U");
--- 15,21 ----
  $foo2=str_replace("tiki-forum_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-forum_rss","tiki-view_forum_thread",$foo["path"]);
! $home = httpPrefix().$foo1;
! $img = httpPrefix().$foo2;
! $read = httpPrefix().$foo3;
  
  $now = date("U");

Index: tiki-forums_rss.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-forums_rss.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tiki-forums_rss.php	22 Dec 2002 08:23:44 -0000	1.2
--- tiki-forums_rss.php	22 Dec 2002 08:42:52 -0000	1.3
***************
*** 11,17 ****
  $foo2=str_replace("tiki-forums_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-forums_rss","tiki-view_forum_thread",$foo["path"]);
! $home = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo1;
! $img = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo2;
! $read = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo3;
  
  $now = date("U");
--- 11,17 ----
  $foo2=str_replace("tiki-forums_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-forums_rss","tiki-view_forum_thread",$foo["path"]);
! $home = httpPrefix().$foo1;
! $img = httpPrefix().$foo2;
! $read = httpPrefix().$foo3;
  
  $now = date("U");

Index: tiki-image_galleries_rss.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-image_galleries_rss.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tiki-image_galleries_rss.php	22 Dec 2002 08:23:44 -0000	1.3
--- tiki-image_galleries_rss.php	22 Dec 2002 08:42:52 -0000	1.4
***************
*** 11,17 ****
  $foo2=str_replace("tiki-image_galleries_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-image_galleries_rss","tiki-browse_image.php",$foo["path"]);
! $home = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo1;
! $img = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo2;
! $read = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo3;
  $title = $tikilib->get_preference("title","Tiki RSS feed for image galleries");
  $now = date("U");
--- 11,17 ----
  $foo2=str_replace("tiki-image_galleries_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-image_galleries_rss","tiki-browse_image.php",$foo["path"]);
! $home = httpPrefix().$foo1;
! $img = httpPrefix().$foo2;
! $read = httpPrefix().$foo3;
  $title = $tikilib->get_preference("title","Tiki RSS feed for image galleries");
  $now = date("U");

Index: tiki-image_gallery_rss.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-image_gallery_rss.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tiki-image_gallery_rss.php	22 Dec 2002 08:23:44 -0000	1.3
--- tiki-image_gallery_rss.php	22 Dec 2002 08:42:52 -0000	1.4
***************
*** 14,20 ****
  $foo2=str_replace("tiki-image_gallery_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-image_gallery_rss","tiki-browse_image",$foo["path"]);
! $home = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo1;
! $img = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo2;
! $read = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo3;
  
  $now = date("U");
--- 14,20 ----
  $foo2=str_replace("tiki-image_gallery_rss.php","img/tiki.jpg",$foo["path"]);
  $foo3=str_replace("tiki-image_gallery_rss","tiki-browse_image",$foo["path"]);
! $home = httpPrefix().$foo1;
! $img = httpPrefix().$foo2;
! $read = httpPrefix().$foo3;
  
  $now = date("U");

Index: tiki-poll_form.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-poll_form.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tiki-poll_form.php	22 Dec 2002 08:23:44 -0000	1.2
--- tiki-poll_form.php	22 Dec 2002 08:42:52 -0000	1.3
***************
*** 23,27 ****
  //$smarty->assign_by_ref('polls',$polls["data"]);
  $smarty->assign_by_ref('channels',$options["data"]);
! $smarty->assign('ownurl',httpScheme().'://'.$_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"]);
  
  // Display the template
--- 23,27 ----
  //$smarty->assign_by_ref('polls',$polls["data"]);
  $smarty->assign_by_ref('channels',$options["data"]);
! $smarty->assign('ownurl',httpPrefix().$_SERVER["REQUEST_URI"]);
  
  // Display the template

Index: tiki-register.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-register.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tiki-register.php	22 Dec 2002 08:23:44 -0000	1.8
--- tiki-register.php	22 Dec 2002 08:42:52 -0000	1.9
***************
*** 79,83 ****
      $foo = parse_url($_SERVER["REQUEST_URI"]);
      $foo1=str_replace("tiki-register","tiki-login_validate",$foo["path"]);
!     $machine =httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo1;
      $userlib->add_user($_REQUEST["name"],$apass,$_REQUEST["email"],$_REQUEST["pass"]);
      $emails = $tikilib->get_mail_events('user_registers','*');
--- 79,83 ----
      $foo = parse_url($_SERVER["REQUEST_URI"]);
      $foo1=str_replace("tiki-register","tiki-login_validate",$foo["path"]);
!     $machine =httpPrefix().$foo1;
      $userlib->add_user($_REQUEST["name"],$apass,$_REQUEST["email"],$_REQUEST["pass"]);
      $emails = $tikilib->get_mail_events('user_registers','*');

Index: tiki-setup.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-setup.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tiki-setup.php	22 Dec 2002 08:23:44 -0000	1.14
--- tiki-setup.php	22 Dec 2002 08:42:52 -0000	1.15
***************
*** 544,548 ****
  }
  
! $ownurl = httpScheme().'://'.$_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
  $server = $_SERVER["SERVER_NAME"];
  $parsed=parse_url($_SERVER["REQUEST_URI"]);
--- 544,548 ----
  }
  
! $ownurl = httpPrefix().$_SERVER["REQUEST_URI"];
  $server = $_SERVER["SERVER_NAME"];
  $parsed=parse_url($_SERVER["REQUEST_URI"]);
***************
*** 551,555 ****
  }
  parse_str($parsed["query"],$query);
! $father=httpScheme().'://'.$server.$parsed["path"];
  if(count($query)>0) {
    $first=1;
--- 551,555 ----
  }
  parse_str($parsed["query"],$query);
! $father=httpPrefix().$parsed["path"];
  if(count($query)>0) {
    $first=1;
***************
*** 567,571 ****
  }
  $ownurl_father=$father;
! $smarty->assign('ownurl',httpScheme().'://'.$_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"]);
  
  if($feature_referer_stats != 'y') {
--- 567,571 ----
  }
  $ownurl_father=$father;
! $smarty->assign('ownurl',httpPrefix().$_SERVER["REQUEST_URI"]);
  
  if($feature_referer_stats != 'y') {

Index: tiki-view_banner.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-view_banner.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tiki-view_banner.php	22 Dec 2002 08:23:44 -0000	1.4
--- tiki-view_banner.php	22 Dec 2002 08:42:52 -0000	1.5
***************
*** 85,89 ****
  
  
! $fp=fopen(httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo1."?id=$bannerId","r");
  $raw='';
  while(!feof($fp)) {
--- 85,89 ----
  
  
! $fp=fopen(httpPrefix().$foo1."?id=$bannerId","r");
  $raw='';
  while(!feof($fp)) {

Index: tiki-wiki_rss.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-wiki_rss.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tiki-wiki_rss.php	22 Dec 2002 08:23:44 -0000	1.4
--- tiki-wiki_rss.php	22 Dec 2002 08:42:52 -0000	1.5
***************
*** 10,15 ****
  $foo1=str_replace("tiki-wiki_rss.php",$tikiIndex,$foo["path"]);
  $foo2=str_replace("tiki-wiki_rss.php","img/tiki.jpg",$foo["path"]);
! $home = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo1;
! $img = httpScheme().'://'.$_SERVER["SERVER_NAME"].$foo2;
  $title = $tikilib->get_preference("title","pepe");
  $changes =   $tikilib->get_last_changes(999, 0, $max_rss_wiki, $sort_mode = 'lastModif_desc');
--- 10,15 ----
  $foo1=str_replace("tiki-wiki_rss.php",$tikiIndex,$foo["path"]);
  $foo2=str_replace("tiki-wiki_rss.php","img/tiki.jpg",$foo["path"]);
! $home = httpPrefix().$foo1;
! $img = httpPrefix().$foo2;
  $title = $tikilib->get_preference("title","pepe");
  $changes =   $tikilib->get_last_changes(999, 0, $max_rss_wiki, $sort_mode = 'lastModif_desc');

Index: xmlrpc.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/xmlrpc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** xmlrpc.php	22 Dec 2002 08:23:44 -0000	1.6
--- xmlrpc.php	22 Dec 2002 08:42:52 -0000	1.7
***************
*** 289,293 ****
   $blogs = $tikilib->list_user_blogs($username,true);
   $foo = parse_url($_SERVER["REQUEST_URI"]);
!  $foo1=httpScheme().'://'.$_SERVER["SERVER_NAME"].str_replace("xmlrpc","tiki-view_blog",$foo["path"]);
  
   foreach($blogs as $blog) {
--- 289,293 ----
   $blogs = $tikilib->list_user_blogs($username,true);
   $foo = parse_url($_SERVER["REQUEST_URI"]);
!  $foo1=httpPrefix().str_replace("xmlrpc","tiki-view_blog",$foo["path"]);
  
   foreach($blogs as $blog) {