Changeset 6036 in subversion


Ignore:
Timestamp:
Apr 4, 2012 10:59:16 AM (14 months ago)
Author:
thomasb
Message:
  • replace claim in Roundcube logo
  • require support_url config option in installer
Location:
trunk/roundcubemail
Files:
1 added
2 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/config/main.inc.php.dist

    r6033 r6036  
    177177$rcmail_config['enable_installer'] = false; 
    178178 
     179// provide an URL where a user can get support for this Roundcube installation 
     180// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! 
     181$rcmail_config['support_url'] = ''; 
     182 
     183// replace Roundcube logo with this image 
     184// specify an URL relative to the document root of this Roundcube installation 
     185$rcmail_config['skin_logo'] = null; 
     186 
     187// automatically create a new Roundcube user when log-in the first time. 
     188// a new user will be created once the IMAP login succeeds. 
     189// set to false if only registered users can use this service 
     190$rcmail_config['auto_create_user'] = true; 
     191 
    179192// use this folder to store log files (must be writeable for apache user) 
    180193// This is used by the 'file' log driver. 
    … …  
    208221// UPDATE users SET username = LOWER(username); 
    209222$rcmail_config['login_lc'] = false; 
    210  
    211 // automatically create a new Roundcube user when log-in the first time. 
    212 // a new user will be created once the IMAP login succeeds. 
    213 // set to false if only registered users can use this service 
    214 $rcmail_config['auto_create_user'] = true; 
    215  
    216 // provide an URL where a user can get support for this Roundcube installation 
    217 // PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! 
    218 $rcmail_config['support_url'] = ''; 
    219  
    220 // replace Roundcube logo with this image 
    221 // specify an URL relative to the document root of this Roundcube installation 
    222 $rcmail_config['skin_logo'] = null; 
    223223 
    224224// Includes should be interpreted as PHP files 

  • trunk/roundcubemail/installer/config.php

    r5662 r6036  
    6060</dd> 
    6161 
     62<dt class="propname">support_url</dt> 
     63<dd> 
     64<?php 
     65 
     66$input_support = new html_inputfield(array('name' => '_support_url', 'size' => 50, 'id' => "cfgsupporturl")); 
     67echo $input_support->show($RCI->getprop('support_url')); 
     68 
     69?> 
     70<div>Provide an URL where a user can get support for this Roundcube installation.<br/>PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!</div> 
     71<p class="hint">Enter an absolute URL (inculding http://) to a support page/form or a mailto: link.</p> 
     72</dd> 
     73 
     74<dt class="propname">skin_logo</dt> 
     75<dd> 
     76<?php 
     77 
     78$input_skin = new html_inputfield(array('name' => '_skin_logo', 'size' => 50, 'id' => "cfgskinlogo")); 
     79echo $input_skin->show($RCI->getprop('skin_logo')); 
     80 
     81?> 
     82<div>Custom image to display instead of the Roundcube logo.</div> 
     83<p class="hint">Enter a URL relative to the document root of this Roundcube installation.</p> 
     84</dd> 
     85 
    6286<dt class="propname">temp_dir</dt> 
    6387<dd> 
    … …  
    6993?> 
    7094<div>Use this folder to store temp files (must be writeable for webserver)</div> 
    71 </dd> 
    72  
    73  
    74 <dt class="propname">ip_check</dt> 
    75 <dd> 
    76 <?php 
    77  
    78 $check_ipcheck = new html_checkbox(array('name' => '_ip_check', 'id' => "cfgipcheck")); 
    79 echo $check_ipcheck->show(intval($RCI->getprop('ip_check')), array('value' => 1)); 
    80  
    81 ?> 
    82 <label for="cfgipcheck">Check client IP in session authorization</label><br /> 
    83  
    84 <p class="hint">This increases security but can cause sudden logouts when someone uses a proxy with changing IPs.</p> 
    8595</dd> 
    8696 
    … …  
    96106<p class="hint">It's a random generated string to ensure that every installation has its own key. 
    97107If you enter it manually please provide a string of exactly 24 chars.</p> 
     108</dd> 
     109 
     110<dt class="propname">ip_check</dt> 
     111<dd> 
     112<?php 
     113 
     114$check_ipcheck = new html_checkbox(array('name' => '_ip_check', 'id' => "cfgipcheck")); 
     115echo $check_ipcheck->show(intval($RCI->getprop('ip_check')), array('value' => 1)); 
     116 
     117?> 
     118<label for="cfgipcheck">Check client IP in session authorization</label><br /> 
     119 
     120<p class="hint">This increases security but can cause sudden logouts when someone uses a proxy with changing IPs.</p> 
    98121</dd> 
    99122 
    … …  
    513536</dd> 
    514537 
    515 <dt class="propname">skin_logo</dt> 
    516 <dd> 
    517 <?php 
    518  
    519 $input_skin = new html_inputfield(array('name' => '_skin_logo', 'size' => 50, 'id' => "cfgskinlogo")); 
    520 echo $input_skin->show($RCI->getprop('skin_logo')); 
    521  
    522 ?> 
    523 <div>Custom image to display instead of the Roundcube logo.</div> 
    524 <p class="hint">Enter a URL relative to the document root of this Roundcube installation.</p> 
    525 </dd> 
    526  
    527538<dt class="propname">mail_pagesize <span class="userconf">*</span></dt> 
    528539<dd> 

  • trunk/roundcubemail/installer/index.php

    r5787 r6036  
    109109<div id="banner"> 
    110110  <div class="banner-bg"></div> 
    111   <div class="banner-logo"><a href="http://roundcube.net"><img src="images/rcube_logo.gif" width="210" height="55" border="0" alt="Roundcube - Open source webmail project" /></a></div> 
     111  <div class="banner-logo"><a href="http://roundcube.net"><img src="images/roundcube_logo.png" width="210" height="55" border="0" alt="Roundcube - open source webmail software" /></a></div> 
    112112</div> 
    113113 
    … …  
    145145 
    146146<?php 
    147 $include_steps = array('./welcome.html', './check.php', './config.php', './test.php'); 
     147$include_steps = array('', './check.php', './config.php', './test.php'); 
    148148 
    149149if ($include_steps[$RCI->step]) { 
    … …  
    159159 
    160160<div id="footer"> 
    161   Installer by the Roundcube Dev Team. Copyright &copy; 2008-2011 - Published under the GNU Public License;&nbsp; 
     161  Installer by the Roundcube Dev Team. Copyright &copy; 2008-2012 – Published under the GNU Public License;&nbsp; 
    162162  Icons by <a href="http://famfamfam.com">famfamfam</a> 
    163163</div> 

  • trunk/roundcubemail/installer/rcube_install.php

    r5787 r6036  
    5151  var $required_config = array( 
    5252    'db_dsnw', 'db_table_contactgroups', 'db_table_contactgroupmembers', 
    53     'des_key', 'session_lifetime', 
     53    'des_key', 'session_lifetime', 'support_url', 
    5454  ); 
    5555 
    … …  
    255255    // iterate over default config 
    256256    foreach ($defaults as $prop => $value) { 
    257       if (!isset($seen[$prop]) && !isset($this->config[$prop]) && isset($required[$prop])) 
     257      if (!isset($seen[$prop]) && isset($required[$prop]) && !(is_bool($this->config[$prop]) || strlen($this->config[$prop]))) 
    258258        $out['missing'][] = array('prop' => $prop); 
    259259    } 
Note: See TracChangeset for help on using the changeset viewer.