Sync some of our fixes. favicon.ico is just to stop the 404s from new bro...

latham

2011-05-19 50c6d10218138f8fdcb669677fe41e0ecf42e454

Sync some of our fixes.  favicon.ico is just to 
stop the 404s from new browsers that check.

 interface/web/favicon.ico

 interface/web/help/lib/module.conf.php

@@ -13,7 +13,7 @@
if(isset($_GET['go2_faq_sections_list']))
    $module['startpage'] = 'help/faq_sections_list.php';
else
    $module['startpage'] = 'help/index.php';
    $module['startpage'] = 'help/version.php';

//* The width of the tab. Normally you should leave this empty and let the browser define the width automatically.
$module['tab_width'] = '';
@@ -94,4 +94,4 @@



?>
?>

 interface/web/mail/form/spamfilter_users.tform.php

@@ -78,7 +78,7 @@
        'policy_id' => array (
            'datatype'    => 'INTEGER',
            'formtype'    => 'SELECT',
            'default'    => '',
            'default'    => '5',
            'datasource'    => array (     'type'    => 'SQL',
                                        'querystring' => 'SELECT id,policy_name FROM spamfilter_policy WHERE {AUTHSQL} ORDER BY policy_name',
                                        'keyfield'=> 'id',
@@ -122,4 +122,4 @@
);


?>
?>

 interface/web/tools/lib/lang/es_usersettings.lng

@@ -5,6 +5,6 @@
$wb['password_mismatch'] = 'La contraseña indicada en el segundo campo no coincide con la del primero.';
$wb['Form to edit the user password and language.'] = 'Formulario para editar el usuario y la contraseña.';
$wb['Settings'] = 'Configuraciones';
$wb['id_rsa_txt'] = 'id_rsa';
$wb['ssh_rsa_txt'] = 'ssh_rsa';
$wb['id_rsa_txt'] = 'De claves RSA';
$wb['ssh_rsa_txt'] = 'Claves SSH RSA';
?>

 interface/web/tools/templates/user_settings.htm

@@ -25,11 +25,11 @@
                </select>
      </div>
     <div class="ctrlHolder">
          <label for="id_rsa">id_rsa</label>
          <label for="id_rsa">{tmpl_var name='id_rsa_txt'}</label>
        <textarea name="id_rsa" id="id_rsa" readonly rows='10' cols='30'>{tmpl_var name='id_rsa'}</textarea>
      </div>
      <div class="ctrlHolder">
          <label for="ssh_rsa">ssh_rsa</label>
          <label for="ssh_rsa">{tmpl_var name='ssh_rsa_txt'}</label>
        <input name="ssh_rsa" id="ssh_rsa" value="{tmpl_var name='ssh_rsa'}" size="30" maxlength="600" type="text" class="textInput" />
      </div>