Changeset 9040

Show
Ignore:
Timestamp:
02/28/10 01:25:02 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 8599-8645,8648-9039 via svnmerge from
http://svn.freepbx.org/freepbx/branches/2.6

........

r8660 | mickecarlsson | 2010-01-23 01:35:24 -0800 (Sat, 23 Jan 2010) | 1 line


Fixed spelling errors for 2.6 branch

........

r8828 | p_lindheimer | 2010-02-16 08:06:59 -0800 (Tue, 16 Feb 2010) | 1 line


sytax error == should be assignment =

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk

    • Property svnmerge-integrated changed from /freepbx/branches/2.6:1-8598,8646-8647 to /freepbx/branches/2.6:1-9039

  • freepbx/trunk/amp_conf/htdocs/admin/page.modules.php

    r8596 r9040  
    486486      if (!EXTERNAL_PACKAGE_MANAGEMENT) { 
    487487        echo "<a href='config.php?display=modules&amp;type=tool&amp;online=0'>"._("Manage local modules")."</a>\n"; 
    488         echo "<input type=\"checkbox\" id=\"show_upgradable_only\" onclick=\"showhide_upgrades();\" /><label for=\"show_upgradable_only\">"._("Show only upgradable")."</label>"; 
     488        echo "<input type=\"checkbox\" id=\"show_upgradable_only\" onclick=\"showhide_upgrades();\" /><label for=\"show_upgradable_only\">"._("Show only upgradeable")."</label>"; 
    489489      } 
    490490    } else { 

  • freepbx/trunk/amp_conf/htdocs/admin/views/bad_refferer.php

    r7699 r9040  
    1616  "<h2>"._("Potential Security Breach")."</h2>\n". 
    1717  "<p>"._("You are attempting to modify settings from a URL that does not appear to have come from a FreePBX page link or button. This can occur if you manually typed in the URL below. This action has been blocked because the HTTP_REFERER does not match your current SERVER. If you require this access, you can set CHECKREFERER=false in amportal.conf to disable this security check")."</p>\n". 
    18   "<p>"._("The suspect URL is listed below. If this action is intended, you can click this link and your action will be processed. Do not proceed with this if you did not intended to execute this command as it may result in changes to your configuraiton.")."</p>\n". 
     18  "<p>"._("The suspect URL is listed below. If this action is intended, you can click this link and your action will be processed. Do not proceed with this if you did not intended to execute this command as it may result in changes to your configuration.")."</p>\n". 
    1919  "<p>"._("SUSPECT LINK:")." &nbsp;<b><a href='".$_SERVER['REQUEST_URI']."'>"."$rtype://".$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI'].$port."</a></b>"."</p>\n". 
    2020  "</div>\n"; 

  • freepbx/trunk/amp_conf/htdocs/admin/views/freepbx_reload.php

    r7346 r9040  
    6969                         
    7070              if (data.num_errors) { 
    71                 responsetext += '<p>' + data.num_errors + " <?php echo _(" error(s) occured, you should view the notification log on the dashboard or main screen to check for more details."); ?> " + "<\/p>"; 
     71                responsetext += '<p>' + data.num_errors + " <?php echo _(" error(s) occurred, you should view the notification log on the dashboard or main screen to check for more details."); ?> " + "<\/p>"; 
    7272              } 
    7373             

  • freepbx/trunk/amp_conf/htdocs/admin/views/loggedout.php

    r8599 r9040  
    33$template['content'] =  
    44  "<h2>"._("Logged out")."</h2>\n". 
    5   "<p>"._("You have been succesfully logged out.")."</p>\n". 
     5  "<p>"._("You have been successfully logged out.")."</p>\n". 
    66  "<p><span style=\"background-color: #dddddd; margin: 6px; padding: 3px; border-style: solid; border-color: #777777; border-top-width: 0px; border-left-width: 0px; border-right-width: 2px; border-bottom-width: 2px;\">\n". 
    77  "<a href=\"".$_SERVER['PHP_SELF']."\">"._("Log in")."</a></span></p>\n"; 

  • freepbx/trunk/amp_conf/htdocs/admin/views/welcome.php

    r6537 r9040  
    5454"If you're having any problems, you can also use the <a href='%s'>Online Support</a>  
    5555module (<b>you need to install this through the <a href='%s'>Module Repository</a> first</b>) 
    56 to talk to other users and the devlopers in real time. Click on <a href='%s'>Start IRC</a>, 
     56to talk to other users and the developers in real time. Click on <a href='%s'>Start IRC</a>, 
    5757when the module is installed, to start a Java IRC client." ), 
    5858  "config.php?type=tool&amp;display=irc", 

  • freepbx/trunk/upgrades/2.6.0beta1/tables.php

    r8599 r9040  
    339339  outn(_("loading table from localprefixes.conf..")); 
    340340  $localPrefixFile = $amp_conf['ASTETCDIR']."/localprefixes.conf"; 
    341   $conf == array(); 
     341  $conf = array(); 
    342342  __parse_DialRulesFile($localPrefixFile, $conf, $section); 
    343343