Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addressbook/crm.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* EGroupware Addressbook: incomming CTI / open CRM view for a given telephon-number and user
* EGroupware Addressbook: incoming CTI / open CRM view for a given telephon-number and user
*
* Usage: curl --user "<user>:<password>" "https://example.com/egroupware/addressbook/crm.php?from=<phone-number>"
*
Expand Down
6 changes: 3 additions & 3 deletions addressbook/inc/class.addressbook_bo.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ public function set_keys ($keys, $pgp, $allow_user_updates = null)
$key = $keys[$contact['email']];
}

// key is stored in file for sql backend or allways for pgp key
// key is stored in file for sql backend or always for pgp key
$path = null;
if ($contact['id'] && $this->pubkey_use_file($pgp, $contact))
{
Expand Down Expand Up @@ -411,7 +411,7 @@ public function set_smime_keys($keys, $allow_user_updates=null)
* Saves contact
*
* Reimplemented to strip pubkeys pasted into pubkey field or imported and store them as files in Vfs.
* We allways store PGP pubkeys to Vfs, but S/Mime ones only for SQL backend, not for LDAP or AD.
* We always store PGP pubkeys to Vfs, but S/Mime ones only for SQL backend, not for LDAP or AD.
*
* @param array &$contact contact array from etemplate::exec
* @param boolean $ignore_acl =false should the acl be checked or not
Expand All @@ -431,7 +431,7 @@ function save(&$contact, $ignore_acl=false, $touch_modified=true)
list($regexp, $file, $bit) = $data;
$matches = null;
if (!empty($contact['pubkey']) && preg_match($regexp, $contact['pubkey'], $matches) &&
// check if we store that pubkey as file (PGP allways, but S/Mime only for SQL backend, not for LDAP or AD!)
// check if we store that pubkey as file (PGP always, but S/Mime only for SQL backend, not for LDAP or AD!)
$this->pubkey_use_file($bit === Api\Contacts::FILES_BIT_PGP_PUBKEY, $contact))
{
// check_perms && save check ACL, in case of access only via own-account we have to use root to allow the update
Expand Down
2 changes: 1 addition & 1 deletion addressbook/inc/class.addressbook_contactform.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ function display_var(array &$content=null,$addressbook=null,$fields=null,$msg=nu
else
{
return '<p align="center">'.lang('There was an error saving your data :-(').'<br />'.
lang('Either the configured email addesses are wrong or the mail configuration.').'</p>';
lang('Either the configured email addresses are wrong or the mail configuration.').'</p>';
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion addressbook/inc/class.addressbook_display.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function display($content=null,$addressbook=null,$fields=null,$msg=null,$email=n
$content['nm1'] = array(
'get_rows' => 'addressbook.addressbook_display.get_rows', // I method/callback to request the data for the rows eg. 'notes.bo.get_rows'
'bottom_too' => false, // I show the nextmatch-line (arrows, filters, search, ...) again after the rows
'never_hide' => True, // I never hide the nextmatch-line if less then maxmatch entrie
'never_hide' => True, // I never hide the nextmatch-line if less then maxmatch entry
'start' => 0, // IO position in list
'cat_id' => '', // IO category, if not 'no_cat' => True
'no_cat' => 'True',
Expand Down
10 changes: 5 additions & 5 deletions addressbook/inc/class.addressbook_egw_record.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

/**
* class addressbook_egw_record
* compability layer for iface_egw_record needed for importexport
* compatibility layer for iface_egw_record needed for importexport
*
* Note that last_event and next_event are not automatically loaded by
* addressbook_bo->read(), so if you need them use:
Expand Down Expand Up @@ -75,7 +75,7 @@ public function __set($_attribute_name, $data) {
/**
* converts this object to array.
* @abstract We need such a function cause PHP5
* dosn't allow objects do define it's own casts :-(
* doesn't allow objects to define its own casts :-(
* once PHP can deal with object casts we will change to them!
*
* @return array complete record as associative array
Expand Down Expand Up @@ -134,12 +134,12 @@ public function get_icon() {
* @return string identifier
*/
public function save ( $_dst_identifier ) {
// Not yet implemeted
// Not yet implemented
$this->identifier = $_dst_identifier;
}

/**
* copys current record to record identified by $_dst_identifier
* copies current record to record identified by $_dst_identifier
*
* @param string $_dst_identifier
* @return string dst_identifier
Expand All @@ -160,7 +160,7 @@ public function move ( $_dst_identifier ) {
}

/**
* delets current record from backend
* deletes current record from backend
*
*/
public function delete () {
Expand Down
6 changes: 3 additions & 3 deletions addressbook/inc/class.addressbook_export_contacts_csv.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
class addressbook_export_contacts_csv implements importexport_iface_export_plugin
{
/**
* Constants used for exploding categories & multi-selectboxes into seperate fields
* Constants used for exploding categories & multi-selectboxes into separate fields
*/
const NO_EXPLODE = False;
const MAIN_CATS = 'main_cats'; // Only the top-level categories get their own field
Expand Down Expand Up @@ -329,7 +329,7 @@ public static function get_description() {
}

/**
* retruns file suffix for exported file
* returns file suffix for exported file
*
* @return string suffix
*/
Expand Down Expand Up @@ -374,7 +374,7 @@ public function get_options_etpl(importexport_definition &$definition = NULL)
}

/**
* returns slectors of this plugin via xajax
* returns selectors of this plugin via xajax
*
*/
public function get_selectors_etpl() {
Expand Down
4 changes: 2 additions & 2 deletions addressbook/inc/class.addressbook_export_vcard.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public static function get_description()
}

/**
* retruns file suffix for exported file
* returns file suffix for exported file
*
* @return string suffix
*/
Expand Down Expand Up @@ -158,7 +158,7 @@ public function get_options_etpl(importexport_definition &$definition = NULL)
}

/**
* returns slectors of this plugin via xajax
* returns selectors of this plugin via xajax
*
*/
public function get_selectors_etpl()
Expand Down
2 changes: 1 addition & 1 deletion addressbook/inc/class.addressbook_favorite_portlet.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public static function process($values = array())
}
elseif(is_null($msg))
{
$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
$msg .= lang('%1 entries %2, %3 failed because of insufficient rights !!!',$success,$action_msg,$failed);
Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
}
elseif($msg)
Expand Down
8 changes: 4 additions & 4 deletions addressbook/inc/class.addressbook_groupdav.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ function propfind($path,&$options,&$files,$user,$id='')
{
return false;
}
if ($id) $path = dirname($path).'/'; // carddav_name get's added anyway in the callback
if ($id) $path = dirname($path).'/'; // carddav_name gets added anyway in the callback

if ($this->debug) error_log(__METHOD__."($path,".array2string($options).",,$user,$id) filter=".array2string($filter));

Expand Down Expand Up @@ -1221,7 +1221,7 @@ function read($id, $path=null)
}

/**
* Check if user has the neccessary rights on a contact
* Check if user has the necessary rights on a contact
*
* @param int $acl Acl::READ, Acl::EDIT or Acl::DELETE
* @param array|int $contact contact-array or id
Expand Down Expand Up @@ -1265,7 +1265,7 @@ function get_shared($ignore_all_in_one=false)
// if "Sync all selected addressbook into one" is set --> no (additional) shared addressbooks
if (!$ignore_all_in_one && in_array('O',$this->home_set_pref)) return array();

// replace symbolic id's with real nummeric id's
// replace symbolic id's with real numeric id's
foreach(array(
'G' => $GLOBALS['egw_info']['user']['account_primary_group'],
'U' => '0',
Expand Down Expand Up @@ -1311,7 +1311,7 @@ public static function groupdav_root_props(array $data)
}

/**
* Return appliction specific settings
* Return application specific settings
*
* @param array $hook_data values for keys 'location', 'type' and 'account_id'
* @return array of array with settings
Expand Down
8 changes: 4 additions & 4 deletions addressbook/inc/class.addressbook_hooks.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static function all_hooks($args)
'ajax' => 'true',
)),
);
// custom fields are not availible in LDAP
// custom fields are not available in LDAP
if ($GLOBALS['egw_info']['server']['contact_repository'] != 'ldap')
{
$file['Custom fields'] = Egw::link('/index.php',array(
Expand Down Expand Up @@ -157,7 +157,7 @@ static function settings($hook_data)
'values' => array('1' => lang('Hide all accounts'), '0' => lang('Show active accounts'), 'none' => lang('Show all accounts')),
'label' => 'Hide accounts from addressbook',
'name' => 'hide_accounts',
'help' => 'Hides accounts completly from the adressbook.',
'help' => 'Hides accounts completely from the adressbook.',
'xmlrpc' => True,
'admin' => false,
'default'=> '0'
Expand Down Expand Up @@ -541,7 +541,7 @@ public static function config(array $config)
$copy_fields = array();
foreach($bocontacts->contact_fields as $field => $label)
{
// some fields the user should never be allowed to copy or are coverted by an other attribute (n_fn for all n_*)
// some fields the user should never be allowed to copy or are converted by an other attribute (n_fn for all n_*)
if (!in_array($field,array('id','tid','created','creator','modified','modifier','account_id','uid','etag','n_fn')))
{
$copy_fields[$field] = $label;
Expand All @@ -561,7 +561,7 @@ public static function config(array $config)
}

$repositories = array('sql' => 'SQL');
// check account-repository, contact-repository LDAP is only availible for account-repository == ldap
// check account-repository, contact-repository LDAP is only available for account-repository == ldap
if ($config['account_repository'] == 'ldap' || !$config['account_repository'] && $config['auth_type'] == 'ldap')
{
$repositories['ldap'] = 'LDAP';
Expand Down
10 changes: 5 additions & 5 deletions addressbook/inc/class.addressbook_import_contacts_csv.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -461,13 +461,13 @@ public static function get_name() {
* @return string descriprion
*/
public static function get_description() {
return lang("Imports contacts into your Addressbook from a CSV File. CSV means 'Comma Separated Values'. However in the options Tab you can also choose other seperators.");
return lang("Imports contacts into your Addressbook from a CSV File. CSV means 'Comma Separated Values'. However in the options Tab you can also choose other separators.");
}

/**
* retruns file suffix(s) plugin can handle (e.g. csv)
* returns file suffix(s) plugin can handle (e.g. csv)
*
* @return string suffix (comma seperated)
* @return string suffix (comma separated)
*/
public static function get_filesuffix() {
return 'csv';
Expand All @@ -476,7 +476,7 @@ public static function get_filesuffix() {
/**
* return etemplate components for options.
* @abstract We can't deal with etemplate objects here, as an uietemplate
* objects itself are scipt orientated and not "dialog objects"
* objects itself are script oriented and not "dialog objects"
*
* @return array (
* name => string,
Expand Down Expand Up @@ -504,7 +504,7 @@ public function get_options_etpl(importexport_definition &$definition=null)
}

/**
* returns etemplate name for slectors of this plugin
* returns etemplate name for selectors of this plugin
*
* @return string etemplate name
*/
Expand Down
10 changes: 5 additions & 5 deletions addressbook/inc/class.addressbook_import_vcard.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class addressbook_import_vcard implements importexport_iface_import_plugin {
);

/**
* actions wich could be done to data entries
* actions which could be done to data entries
*/
protected static $actions = array('insert');

Expand Down Expand Up @@ -330,9 +330,9 @@ public static function get_description() {
}

/**
* retruns file suffix(s) plugin can handle (e.g. csv)
* returns file suffix(s) plugin can handle (e.g. csv)
*
* @return string suffix (comma seperated)
* @return string suffix (comma separated)
*/
public static function get_filesuffix() {
return 'vcf';
Expand All @@ -341,7 +341,7 @@ public static function get_filesuffix() {
/**
* return etemplate components for options.
* @abstract We can't deal with etemplate objects here, as an uietemplate
* objects itself are scipt orientated and not "dialog objects"
* objects itself are script oriented and not "dialog objects"
*
* @return array (
* name => string,
Expand Down Expand Up @@ -373,7 +373,7 @@ public function get_options_etpl(importexport_definition &$definition=null)
}

/**
* returns etemplate name for slectors of this plugin
* returns etemplate name for selectors of this plugin
*
* @return string etemplate name
*/
Expand Down
Loading