Changeset 11050

Show
Ignore:
Timestamp:
01/21/11 14:45:09 (2 years ago)
Author:
mickecarlsson
Message:

Fixes a lot of spelling errors, did cludgy way to localize the amportal.conf warning header, changes some references to amportal.conf

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amp_conf/htdocs/admin/libraries/framework_view.functions.php

    r10953 r11050  
    104104   
    105105  if ($amp_conf['ARI_ADMIN_PASSWORD'] == $amp_conf_defaults['ARI_ADMIN_PASSWORD'][1]) { 
    106     $nt->add_warning('ari', 'ARI_ADMIN_PASSWORD', _("Default ARI Admin password Used"), _("You are using the default ARI Admin password that is widely known, you should change to a new password. Do this in amportal.conf")); 
     106    $nt->add_warning('ari', 'ARI_ADMIN_PASSWORD', _("Default ARI Admin password Used"), _("You are using the default ARI Admin password that is widely known, you should change to a new password. Do this in General Settings/Advanced Settings")); 
    107107  } else { 
    108108    $nt->delete('ari', 'ARI_ADMIN_PASSWORD'); 

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

    r10950 r11050  
    980980  $tooltip  = _("Choose the repositories that you want to check for new modules. Any updates available for modules you have on your system will be detected even if the repository is not checked. If you are installing a new system, you may want to start with the Basic repository and upload all modules, then go back and review the others.").' '; 
    981981  $tooltip .= _(" The modules in the Extended repository are less common and may receive lower levels of support. The Unsupported repository has modules that are not supported by the FreePBX team but may receive some level of support by the authors.").' '; 
    982   $tooltip .= _("The Commerical reposiotry is reserved for modules that are available for purchase and commercially supported.").' '; 
     982  $tooltip .= _("The Commercial repository is reserved for modules that are available for purchase and commercially supported.").' '; 
    983983  $tooltip .= '<br /><br /><small><i>('._("Checking for updates will transmit your FreePBX and Asterisk version numbers along with a unique but random identifier. This is used to provide proper update information and track version usage to focus development and maintenance efforts. No private information is transmitted.").')</i></small>'; 
    984984?> 

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

    r9040 r11050  
    1515  "<div style='margin-left:20px;margin-right:20px'>\n". 
    1616  "<h2>"._("Potential Security Breach")."</h2>\n". 
    17   "<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". 
     17  "<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 Check Server Referrer=false in General Settings/Advanced Settings to disable this security check")."</p>\n". 
    1818  "<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". 

  • freepbx/trunk/libfreepbx.install.php

    r11041 r11050  
    4646  outn("Checking for upgrades.."); 
    4747 
    48   // read versions list from ugprades/ 
     48  // read versions list from upgrades/ 
    4949  $versions = array(); 
    5050  $dir = opendir(UPGRADE_DIR); 
    …… 
    518518  $set['options'] = ''; 
    519519  $set['name'] = 'User Portal Admin Username'; 
    520   $set['description'] = 'This is the default admin name used to allow an administrator to login to ARI bypassing all security. Change this to whatever you want, dont forget to change the ARI_ADMIN_PASSWORD as well.Default = not set'; 
     520  $set['description'] = 'This is the default admin name used to allow an administrator to login to ARI bypassing all security. Change this to whatever you want, dont forget to change the User Portal Admin Password as well. Default = not set'; 
    521521  $set['emptyok'] = 1; 
    522522  $set['type'] = CONF_TYPE_TEXT; 
    …… 
    527527  $set['options'] = ''; 
    528528  $set['name'] = 'User Portal Admin Password'; 
    529   $set['description'] = 'This is the default admin password to allow an administrator to login to ARI bypassing all security. Change this to a secure password.Default = not set'; 
     529  $set['description'] = 'This is the default admin password to allow an administrator to login to ARI bypassing all security. Change this to a secure password. Default = not set'; 
    530530  $set['emptyok'] = 0; 
    531531  $set['type'] = CONF_TYPE_TEXT; 
    …… 
    637637  $set['options'] = ''; 
    638638  $set['name'] = 'Dynamically Generate Hints'; 
    639   $set['description'] = 'If true, Core will not statically generate hints, but instead make a call to the AMPBIN php script, and generate_hints.php through an Asterisk #exec call. This requires Asterisk.conf to be configured with <b>execincludes=yes<b> set in the [options] section.'; 
     639  $set['description'] = 'If true, Core will not statically generate hints, but instead make a call to the AMPBIN php script, and generate_hints.php through an Asterisk #exec call. This requires asterisk.conf to be configured with <b>execincludes=yes<b> set in the [options] section.'; 
    640640  $set['emptyok'] = 0; 
    641641  $set['type'] = CONF_TYPE_BOOL; 
    …… 
    696696  $set['options'] = '0,1,2,3,4,5,6,7,8,9,10'; 
    697697  $set['name'] = 'Noop Traces in Dialplan'; 
    698   $set['description'] = 'Some modules will generate lots of Noop() commands proceeded by a [TRACE](trace_level) that can be used during development or while trying to trace call flows. These Noop() commands serve no other purpose so if you do not want to see excessive Noop()s in your dialplan you can set this to 0. The higher the number the more detailed level of trace Noop()s will be generated'; 
     698  $set['description'] = 'Some modules will generate lots of Noop() commands proceeded by a [TRACE](trace_level) that can be used during development or while trying to trace call flows. These NoOp() commands serve no other purpose so if you do not want to see excessive NoOp()s in your dialplan you can set this to 0. The higher the number the more detailed level of trace NoOp()s will be generated'; 
    699699  $set['emptyok'] = 0; 
    700700  $set['type'] = CONF_TYPE_SELECT; 
    …… 
    760760  $set['options'] = ''; 
    761761  $set['name'] = 'Block CNAM on External Trunks'; 
    762   $set['description'] = 'Some carriers will reject a call if a CallerID Name (CNAM) is presented. This occurs in several areas when configuring CID on the PBX using the format of "CNAM" <CNUM>. To remove the CNAM part of CID on all external trunks, set this value to true. This WILL NOT remove CNAM when a trunk is called from an Intra-Company route. This can be done on each individucal trunk in addition to globaly if there are trunks where it is desirable to keep CNAM information, though most carriers ignore CNAM.'; 
     762  $set['description'] = 'Some carriers will reject a call if a CallerID Name (CNAM) is presented. This occurs in several areas when configuring CID on the PBX using the format of "CNAM" <CNUM>. To remove the CNAM part of CID on all external trunks, set this value to true. This WILL NOT remove CNAM when a trunk is called from an Intra-Company route. This can be done on each individual trunk in addition to globally if there are trunks where it is desirable to keep CNAM information, though most carriers ignore CNAM.'; 
    763763  $set['emptyok'] = 0; 
    764764  $set['type'] = CONF_TYPE_BOOL; 
    …… 
    900900  $set['value'] = true; 
    901901  $set['options'] = ''; 
    902   $set['name'] = 'Check Server Referer'; 
     902  $set['name'] = 'Check Server Referrer'; 
    903903  $set['description'] = 'When set to the default value of true, all requests into FreePBX that might possibly add/edit/delete settings will be validated to assure the request is coming from the server. This will protect the system from CSRF (cross site request forgery) attacks. It will have the effect of preventing legitimately entering URLs that could modify settings which can be allowed by changing this field to false.'; 
    904904  $set['emptyok'] = 0; 
    …… 
    10471047  $set['options'] = ''; 
    10481048  $set['name'] = 'Debug File'; 
    1049   $set['description'] = 'Full path and name of FreePBX debug file. Used by the dbug() funciton by developers.'; 
     1049  $set['description'] = 'Full path and name of FreePBX debug file. Used by the dbug() function by developers.'; 
    10501050  $set['emptyok'] = 0; 
    10511051  $set['type'] = CONF_TYPE_TEXT; 

  • freepbx/trunk/update_i18n.sh

    r10122 r11050  
    11#! /bin/sh 
    2 # Copyright (c) 2008 Mikael Carlsson 
     2# Copyright (c) 2008, 2011 Mikael Carlsson 
    33# This program is free software; you can redistribute it and/or 
    44# modify it under the terms of the GNU General Public License 
    …… 
    1414# The purpose of this script is to extract all text strings from all FreePBX code that can 
    1515# be translated and create template files under each modules/<module>/i18n directory. 
    16 # For this script to work you need to so svn co for for branch and for modules and  
    17 # install this in the same tree so that the script can do all extraction at once.  
     16# For this script to work you need to so svn co for for branch and for modules and 
     17# install this in the same tree so that the script can do all extraction at once. 
    1818# 
    1919 
    …… 
    2121# go down to modules directory 
    2222cd amp_conf/htdocs/admin/modules 
    23 for modules in $(ls -d */);  
     23for modules in $(ls -d */); 
    2424do 
    25   echo "Checking if module ${modules%%/} has an i18n directory" 
    26   # spit out the module.xml in a <modulename>.i18.php so that we can grab it with the find 
    27   # all modules from svn MUST be installed as module_admin reads from  
    28   # the installed modules NOT from the directory itself 
    29   if [ -d ${modules}i18n ]; then 
    30   echo "Found directory ${modules}i18n, creating temp file" 
    31   # This is needed for localization to actually pickup the enclosed text strings 
    32   # This could probably be done better, but I lack the time for doing that so here it is 
    33   echo -e "<?php \nif (false) {" > $modules${modules%%/}.i18n.php 
    34   /var/lib/asterisk/bin/module_admin i18n ${modules%%/} >> $modules${modules%%/}.i18n.php 
    35   # This is needed for localization to actually pickup the enclosed text strings 
    36   # This could probably be done better, but I lack the time for doing that so here it is 
    37   echo -e "}\n?>\n" >> $modules${modules%%/}.i18n.php 
    38   echo "Creating ${modules%%/}.pot file, extracting text strings" 
    39   # Save the file as a temp file 
    40   find ${modules%%/}/*.php | xargs xgettext --no-location -L PHP -o ${modules%%/}/i18n/${modules%%/}.tmp --keyword=_ - 
    41   # Now add the copyright and the license info to the.pot file 
    42   # Again, could be done better, but I lack the time and really need this out now 
    43   echo "# This file is part of FreePBX." > ${modules%%/}/i18n/${modules%%/}.pot 
    44   echo "#" >> ${modules%%/}/i18n/${modules%%/}.pot 
    45   echo "#    FreePBX is free software: you can redistribute it and/or modify" >> ${modules%%/}/i18n/${modules%%/}.pot 
    46   echo "#    it under the terms of the GNU General Public License as published by" >> ${modules%%/}/i18n/${modules%%/}.pot 
    47   echo "#    the Free Software Foundation, either version 2 of the License, or" >> ${modules%%/}/i18n/${modules%%/}.pot 
    48   echo "#    (at your option) any later version." >> ${modules%%/}/i18n/${modules%%/}.pot 
    49   echo "#" >> ${modules%%/}/i18n/${modules%%/}.pot 
    50   echo "#    FreePBX is distributed in the hope that it will be useful," >> ${modules%%/}/i18n/${modules%%/}.pot 
    51   echo "#    but WITHOUT ANY WARRANTY; without even the implied warranty of" >> ${modules%%/}/i18n/${modules%%/}.pot 
    52   echo "#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the" >> ${modules%%/}/i18n/${modules%%/}.pot 
    53   echo "#    GNU General Public License for more details." >> ${modules%%/}/i18n/${modules%%/}.pot 
    54   echo "#" >> ${modules%%/}/i18n/${modules%%/}.pot 
    55   echo "#    You should have received a copy of the GNU General Public License" >> ${modules%%/}/i18n/${modules%%/}.pot 
    56   echo "#    along with FreePBX.  If not, see <http://www.gnu.org/licenses/>." >> ${modules%%/}/i18n/${modules%%/}.pot 
    57   echo "#" >> ${modules%%/}/i18n/${modules%%/}.pot 
    58   echo "# FreePBX language template for ${modules%%/}" >> ${modules%%/}/i18n/${modules%%/}.pot 
    59   echo "# Copyright (C) 2008, 2009, 2010 Bandwith.com" >> ${modules%%/}/i18n/${modules%%/}.pot 
    60   echo "#" >> ${modules%%/}/i18n/${modules%%/}.pot 
    61   # Remove the first six lines of the .tmp file and put it in the -pot file 
    62   /bin/sed '1,6d' ${modules%%/}/i18n/${modules%%/}.tmp >> ${modules%%/}/i18n/${modules%%/}.pot 
    63   echo "Removing temp files" 
    64   rm $modules${modules%%/}.i18n.php 
    65   rm ${modules%%/}/i18n/${modules%%/}.tmp 
    66   fi 
     25        echo "Checking if module ${modules%%/} has an i18n directory" 
     26        # spit out the module.xml in a <modulename>.i18.php so that we can grab it with the find 
     27        # all modules from svn MUST be installed as module_admin reads from 
     28        # the installed modules NOT from the directory itself 
     29        if [ -d ${modules}i18n ]; then 
     30        echo "Found directory ${modules}i18n, creating temp file" 
     31        # This is needed for localization to actually pickup the enclosed text strings 
     32        # This could probably be done better, but I lack the time for doing that so here it is 
     33        echo -e "<?php \nif (false) {" > $modules${modules%%/}.i18n.php 
     34        /var/lib/asterisk/bin/module_admin i18n ${modules%%/} >> $modules${modules%%/}.i18n.php 
     35        # This is needed for localization to actually pickup the enclosed text strings 
     36        # This could probably be done better, but I lack the time for doing that so here it is 
     37        echo -e "}\n?>\n" >> $modules${modules%%/}.i18n.php 
     38        echo "Creating ${modules%%/}.pot file, extracting text strings" 
     39        # Save the file as a temp file 
     40        find ${modules%%/}/*.php | xargs xgettext --no-location -L PHP -o ${modules%%/}/i18n/${modules%%/}.tmp --keyword=_ - 
     41        # Now add the copyright and the license info to the.pot file 
     42        # Again, could be done better, but I lack the time and really need this out now 
     43        echo "# This file is part of FreePBX." > ${modules%%/}/i18n/${modules%%/}.pot 
     44        echo "#" >> ${modules%%/}/i18n/${modules%%/}.pot 
     45        echo "#    FreePBX is free software: you can redistribute it and/or modify" >> ${modules%%/}/i18n/${modules%%/}.pot 
     46        echo "#    it under the terms of the GNU General Public License as published by" >> ${modules%%/}/i18n/${modules%%/}.pot 
     47        echo "#    the Free Software Foundation, either version 2 of the License, or" >> ${modules%%/}/i18n/${modules%%/}.pot 
     48        echo "#    (at your option) any later version." >> ${modules%%/}/i18n/${modules%%/}.pot 
     49        echo "#" >> ${modules%%/}/i18n/${modules%%/}.pot 
     50        echo "#    FreePBX is distributed in the hope that it will be useful," >> ${modules%%/}/i18n/${modules%%/}.pot 
     51        echo "#    but WITHOUT ANY WARRANTY; without even the implied warranty of" >> ${modules%%/}/i18n/${modules%%/}.pot 
     52        echo "#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the" >> ${modules%%/}/i18n/${modules%%/}.pot 
     53        echo "#    GNU General Public License for more details." >> ${modules%%/}/i18n/${modules%%/}.pot 
     54        echo "#" >> ${modules%%/}/i18n/${modules%%/}.pot 
     55        echo "#    You should have received a copy of the GNU General Public License" >> ${modules%%/}/i18n/${modules%%/}.pot 
     56        echo "#    along with FreePBX.  If not, see <http://www.gnu.org/licenses/>." >> ${modules%%/}/i18n/${modules%%/}.pot 
     57        echo "#" >> ${modules%%/}/i18n/${modules%%/}.pot 
     58        echo "# FreePBX language template for ${modules%%/}" >> ${modules%%/}/i18n/${modules%%/}.pot 
     59        echo "# Copyright (C) 2008, 2009, 2010, 2011 Bandwith.com" >> ${modules%%/}/i18n/${modules%%/}.pot 
     60        echo "#" >> ${modules%%/}/i18n/${modules%%/}.pot 
     61        # Remove the first six lines of the .tmp file and put it in the -pot file 
     62        /bin/sed '1,6d' ${modules%%/}/i18n/${modules%%/}.tmp >> ${modules%%/}/i18n/${modules%%/}.pot 
     63    # Now set Project to FreePBX and utf-8 as charset 
     64    /bin/sed -i 's/PACKAGE VERSION/FreePBX/g' ${modules%%/}/i18n/${modules%%/}.pot 
     65    /bin/sed -i 's/charset=CHARSET/charset=utf-8/g' ${modules%%/}/i18n/${modules%%/}.pot 
     66        echo "Removing temp files" 
     67        rm $modules${modules%%/}.i18n.php 
     68        rm ${modules%%/}/i18n/${modules%%/}.tmp 
     69        fi 
    6770done 
    6871# Go back two directory levels 
    6972cd ../.. 
    7073echo "Creating new POT template files for core" 
    71 # spit out the module.xml for core to amp.i18.php so that we can grab it with the find 
     74# spit out the module.xml for core and framework to amp.i18.php so that we can grab it with the find 
    7275echo -e "<?php \nif (false) {" >> admin/modules/core/core.i18n.php 
    7376/var/lib/asterisk/bin/module_admin i18n core >> admin/modules/core/core.i18n.php 
     77/var/lib/asterisk/bin/module_admin i18n framework >> admin/modules/core/core.i18n.php 
    7478echo -e "}\n?>\n" >> admin/modules/core/core.i18n.php 
    7579find admin/*.php admin/cdr/*.php admin/views/*.php admin/common/*.php admin/modules/core/*.php -maxdepth 0 | xargs xgettext --no-location -L PHP -o admin/i18n/amp.tmp --keyword=_ - 
    …… 
    9094echo "#" >> admin/i18n/amp.pot 
    9195echo "# FreePBX language template for amp" >> admin/i18n/amp.pot 
    92 echo "# Copyright (C) 2008, 2009, 2010 Bandwith.com" >> admin/i18n/amp.pot 
     96echo "# Copyright (C) 2008, 2009, 2010, 2011 Bandwith.com" >> admin/i18n/amp.pot 
    9397echo "#" >> admin/i18n/amp.pot 
    9498# remove the <modulename>.i18.php 
    …… 
    96100# Remove the first six lines of the .tmp file and put it in the -pot file 
    97101/bin/sed '1,6d' admin/i18n/amp.tmp >> admin/i18n/amp.pot 
     102# Now set Project to FreePBX and utf-8 as charset 
     103/bin/sed -i 's/PACKAGE VERSION/FreePBX/g' admin/i18n/amp.pot 
     104/bin/sed -i 's/charset=CHARSET/charset=utf-8/g' admin/i18n/amp.pot 
    98105echo "Removing temp files" 
    99106rm admin/i18n/amp.tmp 
    100107echo "Done, now don't forget to commit your work!" 
     108 

  • modules/branches/2.9/core/functions.inc.php

    r11041 r11050  
    34103410function core_advancedsettings_write_amportal(){ 
    34113411  global $amp_conf; 
    3412   $txt = _("#;--------------------------------------------------------------------------------;\n#; Do NOT edit this file as it is auto-generated by FreePBX. All modifications to ;\n#; this file must be done via the web gui. There are alternative files to make    ;\n#; custom modifications, details at: http://freepbx.org/configuration_files       ;\n#;--------------------------------------------------------------------------------;\n\n\n"); 
    3413   $txt .= "#;--------------------------------------------------------------------------------;\n#;" . _(' All settings can be set from the Advanced Settings page accessible from the General Settings page in FreePBX')."\n#;--------------------------------------------------------------------------------;\n\n\n\n\n\n\n\n\n\n\n\n"; 
     3412  $txt  = "#;--------------------------------------------------------------------------------;\n#;" 
     3413  $txt .= _("Do NOT edit this file as it is auto-generated by FreePBX. All modifications to"); 
     3414  $txt .= " ;\n#; "; 
     3415  $txt .= _("this file must be done via the web gui. There are alternative files to make"); 
     3416  $txt .= "    ;\n#; "; 
     3417  $txt .= _("custom modifications, details at:"); 
     3418  $txt .= "http://freepbx.org/configuration_files       ;\n#;--------------------------------------------------------------------------------;\n\n\n"; 
     3419  $txt .= "#;--------------------------------------------------------------------------------;\n#; "; 
     3420  $txt .= _("All settings can be set from the Advanced Settings page accessible from the General Settings page in FreePBX"); 
     3421  $txt .= "\n#;--------------------------------------------------------------------------------;\n\n\n\n\n\n\n\n\n\n\n\n"; 
    34143422  foreach ($amp_conf as $key => $val) { 
    34153423    $txt .= trim($key) . '=' . trim($val) . "\n"; 
    …… 
    60976105 
    60986106    $concurrency_limit = isset($concurrency_limit) ? $concurrency_limit : $amp_conf['CONCURRENCYLIMITDEFAULT']; 
    6099     $currentcomponent->addguielem($section, new gui_selectbox('concurrency_limit', $currentcomponent->getoptlist('concurrency_limit'), $concurrency_limit, _("Outbound Councurrency Limit"), _("Maximum number of outbound simultaneous calls that an extension can make. This is also very useful as a Security Protection against a system that has been compromised. It will limit the number of simultaneous calls that can be made on the compromised extension."), false)); 
     6107    $currentcomponent->addguielem($section, new gui_selectbox('concurrency_limit', $currentcomponent->getoptlist('concurrency_limit'), $concurrency_limit, _("Outbound Concurrency Limit"), _("Maximum number of outbound simultaneous calls that an extension can make. This is also very useful as a Security Protection against a system that has been compromised. It will limit the number of simultaneous calls that can be made on the compromised extension."), false)); 
    61006108 
    61016109    $currentcomponent->addguielem($section, new gui_selectbox('callwaiting', $currentcomponent->getoptlist('callwaiting'), $callwaiting, _("Call Waiting"), _("Set the initial/current Call Waiting state for this user's extension"), false)); 
    …… 
    61696177    $currentcomponent->addguielem($section, new gui_textbox('busy_cid', $busy_cid, '&nbsp;&nbsp;'._("CID Prefix"), _("Optional CID Prefix to add before sending to this busy destination.")),5,9); 
    61706178 
    6171     $helptext = _('Optional destination the call is routed to when the phone is offline, such as a softphone currenlty off or a phone unplugged.'); 
     6179    $helptext = _('Optional destination the call is routed to when the phone is offline, such as a softphone currently off or a phone unplugged.'); 
    61726180    $nodest_msg = _('Unavail Voicemail if Enabled'); 
    61736181    $currentcomponent->addguielem($section, new gui_drawselects('chanunavail_dest', '2', $chanunavail_dest, _('Not Reachable'), $helptext, $canbeempty = true, '', $nodest_msg),5,9); 

  • modules/branches/2.9/core/page.ampusers.php

    r9786 r11050  
    180180      <tr> 
    181181        <td colspan="2"> 
    182   <?php echo '<b>'._("NOTE:").'</b>'._("AUTHTYPE is not set to 'database' in /etc/amportal.conf - note that this module is not currently providing access control, and changing passwords here or adding users will have no effect unless AUTHTYPE is set to 'database'.") ?><br /><br /> 
     182  <?php echo '<b>'._("NOTE:").'</b>'._("Authorization Type is not set to 'database' in General Settings/Advanced Setting - note that this module is not currently providing access control, and changing passwords here or adding users will have no effect unless Authorization Type is set to 'database'.") ?><br /><br /> 
    183183        </td> 
    184184      </tr>