Menu
▾
▴
[Tikiwiki-cvs] tiki/templates header.tpl, 1.72, 1.73 tiki-admin-include-general.tpl, 1.62, 1.63 tiki-admin-include-login.tpl, 1.72, 1.73 tiki-browse_freetags.tpl, 1.26, 1.27 tiki-browse_users.tpl, 1.1, 1.2 tiki-show_page.tpl, 1.109, 1.110 tiki-wiki3d.tpl, 1.6, 1.7
|
From: <ny...@us...> - 2007-05-31 09:43:01
|
Update of /cvsroot/tikiwiki/tiki/templates In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17299/templates Modified Files: header.tpl tiki-admin-include-general.tpl tiki-admin-include-login.tpl tiki-browse_freetags.tpl tiki-browse_users.tpl tiki-show_page.tpl tiki-wiki3d.tpl Log Message: [MOD] absolute URI / login : Determine http and https URLs automatically and remove configuration need for tiki domain and https mode. This commit affects the way HTTPS and absolute URI are handled in Tiki. = Not changed = * https_mode (boolean, true if we are currently using HTTPS) * http_port (configurable in admin panels) * https_port (configurable in admin panels) * login_url (used in code, but not configurable, as previously) * https_login (configurable in admin panels, determine if we should allow HTTPS for login step) * https_login_required (same as above, but force an HTTPS login) Note that 'http_port' and 'https_port' are empty when used if they have the default values (respectively 80 and 443). = New global and smarty vars to be used everywhere for absolute URLs = * base_url (auto-detected in tiki-setup.php, using current protocol and including the directory path, not configurable) * base_url_http (same as base_url but forced to 'http://') * base_url_https (same as base_url but forced to 'https://') ...and to be less used (base_url is built on them): * url_scheme ('http' or 'https', depending on which is currently used) * url_host (current host) * url_port (current port) * url_path (current directory path that both begins and ends with a '/') = Not used anymore = * url_prefix * http_svrname * https_prefix * https_domain * feature_server_name * https = Obsoleted (Not used in the main code, but keeped to be compatible with other styles templates) = * http_login_url (same as login_url) * https_login_url (same as login_url) * http_prefix (same as url_path) * http_domain (same as url_host) * tiki_path (same as url_path) They are now only used in templates/styles/... (Those used in lib/pdflib/pdflib.php are not the same). Tikilib::httpScheme() and Tikilib::httpPrefix(), used many times too, have been ugraded to directly use the new global vars, to avoid duplicated code and overhead. They now handle the port used. Index: header.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/header.tpl,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- header.tpl 17 May 2007 18:33:31 -0000 1.72 +++ header.tpl 31 May 2007 09:42:58 -0000 1.73 @@ -8,7 +8,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html> <head> -{* can be needed for sefurls with tiki not installed at the root server {if $feature_server_name}<base href="{$feature_server_name}" />{/if} *} +{* can be needed for sefurls with tiki not installed at the root server {if $base_url}<base href="{$base_url}" />{/if} *} <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> {if $metatag_keywords ne ''}<meta name="keywords" content="{$metatag_keywords}" /> {/if} Index: tiki-admin-include-general.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-admin-include-general.tpl,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- tiki-admin-include-general.tpl 25 May 2007 20:24:53 -0000 1.62 +++ tiki-admin-include-general.tpl 31 May 2007 09:42:58 -0000 1.63 @@ -254,49 +254,22 @@ {tr}compression is handled by{/tr}: {$gzip_handler} </div>{/if} </td> - <td><input type="checkbox" name="feature_obzip" id="general-gzip" - {if $feature_obzip eq 'y'}checked="checked"{/if}/> - - - </td> + <td><input type="checkbox" name="feature_obzip" id="general-gzip" {if $feature_obzip eq 'y'}checked="checked"{/if}/></td> <td> </td> <td class="form"><label for="general-pageviews">{tr}Count admin pageviews{/tr}:</label></td> - <td><input type="checkbox" name="count_admin_pvs" id="general-pageviews" - {if $count_admin_pvs eq 'y'}checked="checked"{/if}/> - </td> + <td><input type="checkbox" name="count_admin_pvs" id="general-pageviews" {if $count_admin_pvs eq 'y'}checked="checked"{/if}/></td> </tr><tr> <td class="form"><label for="general-anon_modules">{tr}Hide anonymous-only modules from registered users{/tr}:</label></td> - <td><input type="checkbox" name="modseparateanon" id="general-anon_modules" - {if $modseparateanon eq 'y'}checked="checked"{/if}/> - </td> + <td><input type="checkbox" name="modseparateanon" id="general-anon_modules" {if $modseparateanon eq 'y'}checked="checked"{/if}/></td> <td> </td> </tr></table> <table class="admin"><tr> <td colspan="2"><hr/></td> </tr><tr> - <td class="form" > - <label for="general-server_name">{tr}Server name (for absolute URIs){/tr}:</label></td> - <td ><input type="text" name="feature_server_name" id="general-server_name" - value="{$feature_server_name|escape}" size="40" /></td> - </tr><tr> - <td class="form" > - <label for="general-https">{tr}HTTPS Server{/tr}:</label></td> - <td ><select name="https" id="general-https"> - <option value="auto" {if $https=="auto"}selected="selected"{/if}>{tr}Automatic (uses HTTPS variable){/tr}</option> - <option value="http" {if $https=="http"}selected="selected"{/if}>{tr}No{/tr}</option> - <option value="https" {if $https=="https"}selected="selected"{/if}>{tr}Yes{/tr}</option> - </select> - </td> - </tr><tr> <td class="form"><label for="general-browser_title">{tr}Browser title{/tr}:</label></td> <td><input type="text" name="siteTitle" id="general-browser_title" value="{$siteTitle|escape}" size="40" /></td> </tr><tr> -<!-- - <td class="form"><label for="general-tiki_title">{tr}Wiki_Tiki_Title{/tr}: </label></td> - <td><input type="text" size="5" name="title" id="general-tiki_title" value="{$title|escape}" size="40" /></td> - </tr><tr> ---> <td class="form"><label for="general-temp">{tr}Temporary directory{/tr}:</label></td> <td><input type="text" name="tmpDir" id="general-temp" value="{$tmpDir|escape}" size="50" /></td> </tr><tr> Index: tiki-admin-include-login.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-admin-include-login.tpl,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- tiki-admin-include-login.tpl 29 May 2007 21:56:32 -0000 1.72 +++ tiki-admin-include-login.tpl 31 May 2007 09:42:59 -0000 1.73 @@ -120,21 +120,13 @@ <tr><td class="form">{tr}Password invalid after days{/tr}:</td><td><input type="text" name="pass_due" value="{$pass_due|escape}" /><i>-1 for never</i></td></tr> <tr><td class="form">{tr}Re-validate user by email after days{/tr}:</td><td><input type="text" name="email_due" value="{$email_due|escape}" /><i>-1 for never</i></td></tr> <tr><td class="form">{tr}Re-validate user by email after unsuccessful logins{/tr}:</td><td><input type="text" name="unsuccessful_logins" value="{$unsuccessful_logins|escape}" /><i>-1 for never</i></td></tr> -<!-- # not implemented -<tr><td class="form">{tr}Require HTTP Basic authentication{/tr}:</td><td><input type="checkbox" name="http_basic_auth" {if $http_basic_auth eq 'y'}checked="checked"{/if}/></td></tr> ---> <tr><td class="form">{tr}Allow secure (https) login{/tr}:</td><td><input type="checkbox" name="https_login" {if $https_login eq 'y'}checked="checked"{/if}/></td></tr> <tr><td class="form">{tr}Require secure (https) login{/tr}:</td><td><input type="checkbox" name="https_login_required" {if $https_login_required eq 'y'}checked="checked"{/if}/></td></tr> -<tr><td class="form">{tr}HTTP server name{/tr}:</td><td><input type="text" name="http_domain" value="{$http_domain|escape}" size="50" /></td></tr> <tr><td class="form">{tr}HTTP port{/tr}:</td><td><input type="text" name="http_port" size="5" value="{$http_port|escape}" /></td></tr> -<tr><td class="form">{tr}HTTP URL prefix{/tr}:</td><td><input type="text" name="http_prefix" value="{$http_prefix|escape}" size="50" /></td></tr> -<tr><td class="form">{tr}HTTPS server name{/tr}:</td><td><input type="text" name="https_domain" value="{$https_domain|escape}" size="50" /></td></tr> <tr><td class="form">{tr}HTTPS port{/tr}:</td><td><input type="text" name="https_port" size="5" value="{$https_port|escape}" /></td></tr> -<tr><td class="form">{tr}HTTPS URL prefix{/tr}:</td><td><input type="text" name="https_prefix" value="{$https_prefix|escape}" size="50" /></td></tr> <tr><td class="form">{tr}Remember me feature{/tr}:</td><td class="form"> <select name="rememberme"> <option value="disabled" {if $rememberme eq 'disabled'}selected="selected"{/if}>{tr}Disabled{/tr}</option> -<!--<option value="noadmin" {if $rememberme eq 'noadmin'}selected="selected"{/if}>{tr}Only for users{/tr}</option>--> <option value="all" {if $rememberme eq 'all'} selected="selected"{/if}>{tr}User's choice{/tr}</option> <option value="always" {if $rememberme eq 'always'} selected="selected"{/if}>{tr}Always{/tr}</option> </select><br /> Index: tiki-browse_freetags.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-browse_freetags.tpl,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- tiki-browse_freetags.tpl 15 May 2007 07:06:11 -0000 1.26 +++ tiki-browse_freetags.tpl 31 May 2007 09:42:59 -0000 1.27 @@ -12,7 +12,7 @@ <div class="morcego_embedded"> <h2>{tr}Network of Tags related to{/tr}: <span id="currentTag1">{$tag}</span></h2> <applet codebase="./lib/wiki3d" archive="morcego-0.4.0.jar" code="br.arca.morcego.Morcego" width="{$freetags_3d_width}" height="{$freetags_3d_height}"> - <param name="serverUrl" value="{$base_url}/tiki-freetag3d_xmlrpc.php"> + <param name="serverUrl" value="{$base_url}tiki-freetag3d_xmlrpc.php"> <param name="startNode" value="{$tag}"> <param name="windowWidth" value="{$freetags_3d_width}"> <param name="windowHeight" value="{$freetags_3d_height}"> Index: tiki-browse_users.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-browse_users.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- tiki-browse_users.tpl 14 Dec 2005 17:40:34 -0000 1.1 +++ tiki-browse_users.tpl 31 May 2007 09:42:59 -0000 1.2 @@ -10,7 +10,7 @@ <div class="morcego_embedded"> <h2>{tr}Network of Users related to{/tr}: <span id="currentTag1">{$tag}</span></h2> <applet codebase="./lib/wiki3d" archive="morcego-0.4.0.jar" code="br.arca.morcego.Morcego" width="{$wiki_3d_width}" height="{$wiki_3d_height}"> - <param name="serverUrl" value="{$base_url}/tiki-users3d_xmlrpc.php"> + <param name="serverUrl" value="{$base_url}tiki-users3d_xmlrpc.php"> <param name="startNode" value="{$view_user}"> <param name="windowWidth" value="{$wiki_3d_width}"> <param name="windowHeight" value="{$wiki_3d_height}"> Index: tiki-show_page.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-show_page.tpl,v retrieving revision 1.109 retrieving revision 1.110 diff -u -d -r1.109 -r1.110 --- tiki-show_page.tpl 20 Mar 2007 17:24:22 -0000 1.109 +++ tiki-show_page.tpl 31 May 2007 09:42:59 -0000 1.110 @@ -244,7 +244,7 @@ {if $print_page eq 'y'} <div class="editdate" align="center"><p> - {tr}The original document is available at{/tr} <a href="{$urlprefix}tiki-index.php?page={$page|escape:"url"}">{$urlprefix}tiki-index.php?page={$page|escape:"url"}</a> + {tr}The original document is available at{/tr} <a href="{$base_url}tiki-index.php?page={$page|escape:"url"}">{$base_url}tiki-index.php?page={$page|escape:"url"}</a> </p></div> {/if} Index: tiki-wiki3d.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-wiki3d.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- tiki-wiki3d.tpl 12 Dec 2005 15:18:57 -0000 1.6 +++ tiki-wiki3d.tpl 31 May 2007 09:42:59 -0000 1.7 @@ -2,7 +2,7 @@ <body style="margin-top: 0px; margin-left: 0px"> <applet codebase="./lib/wiki3d" archive="morcego-0.4.0.jar" code="br.arca.morcego.Morcego" width="{$wiki_3d_width}" height="{$wiki_3d_height}"> - <param name="serverUrl" value="{$base_url}/tiki-wiki3d_xmlrpc.php"> + <param name="serverUrl" value="{$base_url}tiki-wiki3d_xmlrpc.php"> <param name="startNode" value="{$page}"> <param name="windowWidth" value="{$wiki_3d_width}"> <param name="windowHeight" value="{$wiki_3d_height}"> |