Changeset 2223

Show
Ignore:
Timestamp:
08/05/06 00:05:31 (7 years ago)
Author:
gregmac
Message:

Minor bug fixes, reformat some text

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.1/irc/page.irc.php

    r2222 r2223  
    8787  var nick = null; 
    8888  nick = getCookie('ircnick'); 
     89  if (nick == 'null') nick = ''; 
    8990   
    9091  nick = prompt("What nickname would you like to use? If you leave this blank, a nick will be automatically generated for you.", nick); 
     
    100101} 
    101102</script> 
     103<?php 
     104if (isset($_GET['nick'])) { 
     105  // prevent XSS and other issues 
     106  $nick = preg_replace('/[^a-zA-Z0-9_\-!]/','',$_GET['nick']); 
     107} else { 
     108  $nick = ''; 
     109} 
     110?> 
    102111 
    103112<div class="rnav"> 
     
    118127 
    119128<p> 
    120 <?php echo _("When you connect, you will be automatically be named 'FreePBX' and a random 4 digit number, eg, FreePBX3486. If you wish to change this to your normal nickname, you can type '<b>/nick yournickname</b>', and your nick will change. This is an ENGLISH ONLY support channel. Sorry.")?> 
     129<?php  
     130if (empty($nick)) echo _("When you connect, you will be automatically be named 'FreePBX' and a random 4 digit number, eg, FreePBX3486."); 
     131echo _("If you wish to change this to your normal nickname, you can type '<b>/nick yournickname</b>', and your nick will change. This is an ENGLISH ONLY support channel. Sorry."); 
     132?> 
    121133</p> 
    122134 
    123135<applet name="PJirc" codebase="modules/irc/pjirc/" code="IRCApplet.class" archive="irc.jar,pixx.jar" width="640" height="400"> 
    124136<param name="CABINETS" value="irc.cab,securedirc.cab,pixx.cab"> 
    125 <?php 
    126 if (isset($_GET['nick'])) { 
    127   // prevent XSS and other issues 
    128   $nick = preg_replace('/[^a-zA-Z0-9_\-!]/','',$_GET['nick']); 
    129 } else { 
    130   $nick = ''; 
    131 } 
    132 ?> 
    133137<param name="nick" value="<?php echo (!empty($nick) ? $nick : 'FreePBX????') ?>"> 
    134 <param name="alternatenick" value="FreePBXU????"> 
     138<param name="alternatenick" value="<?php echo (!empty($nick) ? $nick.'_' : 'FreePBXU????') ?>"> 
    135139<param name="host" value="irc.freenode.net"> 
    136140<param name="gui" value="pixx"> 
  • modules/branches/2.2/irc/page.irc.php

    r2222 r2223  
    8787  var nick = null; 
    8888  nick = getCookie('ircnick'); 
     89  if (nick == 'null') nick = ''; 
    8990   
    9091  nick = prompt("What nickname would you like to use? If you leave this blank, a nick will be automatically generated for you.", nick); 
     
    100101} 
    101102</script> 
     103<?php 
     104if (isset($_GET['nick'])) { 
     105  // prevent XSS and other issues 
     106  $nick = preg_replace('/[^a-zA-Z0-9_\-!]/','',$_GET['nick']); 
     107} else { 
     108  $nick = ''; 
     109} 
     110?> 
    102111 
    103112<div class="rnav"> 
     
    118127 
    119128<p> 
    120 <?php echo _("When you connect, you will be automatically be named 'FreePBX' and a random 4 digit number, eg, FreePBX3486. If you wish to change this to your normal nickname, you can type '<b>/nick yournickname</b>', and your nick will change. This is an ENGLISH ONLY support channel. Sorry.")?> 
     129<?php  
     130if (empty($nick)) echo _("When you connect, you will be automatically be named 'FreePBX' and a random 4 digit number, eg, FreePBX3486."); 
     131echo _("If you wish to change this to your normal nickname, you can type '<b>/nick yournickname</b>', and your nick will change. This is an ENGLISH ONLY support channel. Sorry."); 
     132?> 
    121133</p> 
    122134 
    123135<applet name="PJirc" codebase="modules/irc/pjirc/" code="IRCApplet.class" archive="irc.jar,pixx.jar" width="640" height="400"> 
    124136<param name="CABINETS" value="irc.cab,securedirc.cab,pixx.cab"> 
    125 <?php 
    126 if (isset($_GET['nick'])) { 
    127   // prevent XSS and other issues 
    128   $nick = preg_replace('/[^a-zA-Z0-9_\-!]/','',$_GET['nick']); 
    129 } else { 
    130   $nick = ''; 
    131 } 
    132 ?> 
    133137<param name="nick" value="<?php echo (!empty($nick) ? $nick : 'FreePBX????') ?>"> 
    134 <param name="alternatenick" value="FreePBXU????"> 
     138<param name="alternatenick" value="<?php echo (!empty($nick) ? $nick.'_' : 'FreePBXU????') ?>"> 
    135139<param name="host" value="irc.freenode.net"> 
    136140<param name="gui" value="pixx">