Changeset 3008

Show
Ignore:
Timestamp:
11/05/06 21:12:19 (7 years ago)
Author:
qldrob
Message:

Add 'This is a Beta' warning, encourage people to use firefox, and fix a small issue that was causing a warning with a bad asdtb entry.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amp_conf/htdocs/admin/config.php

    r3000 r3008  
    251251        $module_hook = new moduleHook; 
    252252         
     253        // let hooking modules process the $_REQUEST 
     254        $module_hook->process_hooks($itemid,$modkey,$item,$_REQUEST); 
    253255        // populate object variables 
    254256        $module_hook->install_hooks($itemid,$modkey,$item); 
    …… 
    261263          echo $currentcomponent->generateconfigpage(); 
    262264        } 
    263  
    264         // let hooking modules process the $_REQUEST 
    265         $module_hook->process_hooks($itemid,$modkey,$item,$_REQUEST); 
    266265 
    267266      } 
    …… 
    278277    if ($astman) { 
    279278      printf( "<h2>%s</h2>", dgettext("welcome page", "Welcome to freePBX.") ); 
     279// BETA code - remove later. 
     280      printf( "<p>%s</p>", dgettext("welcome page", "You are running a BETA VERSION of freePBX. This release probably has bugs, and the point of this release is to get as many of them fixed as possible.") ); 
     281       
     282      printf( "<p>%s</p>"  , dgettext("welcome page", "We urge to you report any bugs you find. Current known bugs are maintained on <a href='http://www.aussievoip.com/wiki/freePBX-2.2'>the users website</a>. If you find a bug, please <a href='http://www.freepbx.org/trac/newticket'>create a bug report</a> and update the information on the <a href='http://www.aussievoip.com/wiki/freePBX-2.2'>users website</a> so that it can be easily tracked by other users.") ); 
     283      printf( "<p>%s</p>"  , dgettext("welcome page", "Note, presently, Microsoft's Internet Explorer is <b>not</b> a supported web browser, and you must use a standards compliant browser, such as Firefox. There is a link on the <a href='http://www.freepbx.org'>right hand side of freePBX.org</a> that will allow you to download Firefox easily. By using that link, Google will donate US$1 to the freePBX project.") ); 
    280284      printf( "<p>%s</p>"  , dgettext("welcome page", "If you're new to freePBX, Welcome. Here are some quick instructions to get you started") ); 
    281285       

  • freepbx/trunk/amp_conf/htdocs/admin/modules/core/functions.inc.php

    r2994 r3008  
    11601160  //explode recording vars 
    11611161  $recording = explode("|",$results['recording']); 
    1162   $recout = substr($recording[0],4); 
    1163   $recin = substr($recording[1],3); 
    1164   $results['record_in']=$recin; 
    1165   $results['record_out']=$recout; 
    1166  
     1162  if (isset($recording[1])) { 
     1163    $recout = substr($recording[0],4); 
     1164    $recin = substr($recording[1],3); 
     1165    $results['record_in']=$recin; 
     1166    $results['record_out']=$recout; 
     1167  } else { 
     1168    $results['record_in']='Adhoc'; 
     1169    $results['record_out']='Adhoc'; 
     1170  } 
    11671171  return $results; 
    11681172}