blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some comments typo

Browse Source
This commit is contained in:
Paolo
2019-04-30 13:13:34 +02:00
parent 783910b84c
commit 3b4012798f
15 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/ExtensionsLib.php
+3 -3
View File
@@ -7,7 +7,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
*/
class ExtensionsLib
{
const SQL_DIRECTORY = 'sql'; // directory where to retrive SQL scripts
const SQL_DIRECTORY = 'sql'; // directory where to retrieve SQL scripts
const SQL_FILE_EXTENSION = '.sql'; // SQL scripts file extension
const FILE_INPUT_NAME = 'extension'; // name of the HTTP parameter containing the archive data
@@ -200,7 +200,7 @@ class ExtensionsLib
}
/**
* Retrive the list of all the installed extensions
* Retrieve the list of all the installed extensions
*/
public function getInstalledExtensions()
{
@@ -253,7 +253,7 @@ class ExtensionsLib
// If the upload was a success
if ($this->_ci->upload->do_upload(ExtensionsLib::FILE_INPUT_NAME))
{
$uploadData = $this->_ci->upload->data(); // retrives data about the uploaded file
$uploadData = $this->_ci->upload->data(); // retrieves data about the uploaded file
// Checks the file extension
$uploadedFileExtension = '.'.pathinfo($uploadData['full_path'], PATHINFO_EXTENSION);
if (!in_array($uploadedFileExtension, $this->ARCHIVE_EXTENSIONS))
application/libraries/FiltersLib.php
+19 -19
View File
@@ -23,7 +23,7 @@ class FiltersLib
const SESSION_DATASET_REPRESENTATION = 'datasetRepresentation';
const SESSION_DATASET_REP_OPTIONS = 'datasetRepresentationOptions';
// Alias for the dynamic table used to retrive the dataset
// Alias for the dynamic table used to retrieve the dataset
const DATASET_TABLE_ALIAS = 'datasetFilterTable';
// Parameters names...
@@ -40,7 +40,7 @@ class FiltersLib
// ...to specify permissions that are needed to use this FilterWidget
const REQUIRED_PERMISSIONS_PARAMETER = 'requiredPermissions';
// ...stament to retrive the dataset
// ...stament to retrieve the dataset
const QUERY_PARAMETER = 'query';
// ...to specify more columns or aliases for them
@@ -136,7 +136,7 @@ class FiltersLib
}
/**
* Wrapper method to the session helper funtions to retrive the whole session for this filter
* Wrapper method to the session helper funtions to retrieve the whole session for this filter
*/
public function getSession()
{
@@ -144,7 +144,7 @@ class FiltersLib
}
/**
* Wrapper method to the session helper funtions to retrive one element from the session of this filter
* Wrapper method to the session helper funtions to retrieve one element from the session of this filter
*/
public function getSessionElement($name)
{
@@ -192,7 +192,7 @@ class FiltersLib
$this->_ci->FiltersModel->addJoin('public.tbl_benutzer', 'person_id', 'LEFT'); // left join with benutzer table
$this->_ci->FiltersModel->addSelect('system.tbl_filters.*'); // select only from table filters
$this->_ci->FiltersModel->addOrder('sort', 'ASC'); // sort on column sort
$this->_ci->FiltersModel->addLimit(1); // if more than one filter is set as default only one will be retrived
$this->_ci->FiltersModel->addLimit(1); // if more than one filter is set as default only one will be retrieved
$definition = null;
$whereParameters = null; // where clause parameters
@@ -206,7 +206,7 @@ class FiltersLib
}
else
{
// If we can univocally retrive a filter
// If we can univocally retrieve a filter
if ($app != null && $datasetName != null && $filterKurzbz != null)
{
$whereParameters = array(
@@ -280,7 +280,7 @@ class FiltersLib
}
/**
* Generate the query to retrive the dataset for a filter
* Generate the query to retrieve the dataset for a filter
*/
public function generateDatasetQuery($query, $filters)
{
@@ -316,7 +316,7 @@ class FiltersLib
}
/**
* Retrives the dataset from the DB
* Retrieves the dataset from the DB
*/
public function getDataset($datasetQuery)
{
@@ -368,7 +368,7 @@ class FiltersLib
// Checks the parameter selectedFields
if (isset($selectedFields) && is_array($selectedFields) && count($selectedFields) > 0)
{
// Retrives all the used fields by the current filter
// Retrieves all the used fields by the current filter
$fields = $this->getSessionElement(self::SESSION_FIELDS);
// Checks that the given selected fields are present in all the used fields by the current filter
@@ -393,9 +393,9 @@ class FiltersLib
// Checks the parameter selectedField
if (!isEmptyString($selectedField))
{
// Retrives all the used fields by the current filter
// Retrieves all the used fields by the current filter
$fields = $this->getSessionElement(self::SESSION_FIELDS);
// Retrives the selected fields by the current filter
// Retrieves the selected fields by the current filter
$selectedFields = $this->getSessionElement(self::SESSION_SELECTED_FIELDS);
// Checks that the given selected field is present in the list of all the used fields by the current filter
@@ -427,9 +427,9 @@ class FiltersLib
// Checks the parameter selectedField
if (!isEmptyString($selectedField))
{
// Retrives all the used fields by the current filter
// Retrieves all the used fields by the current filter
$fields = $this->getSessionElement(self::SESSION_FIELDS);
// Retrives the selected fields by the current filter
// Retrieves the selected fields by the current filter
$selectedFields = $this->getSessionElement(self::SESSION_SELECTED_FIELDS);
// Checks that the given selected field is present in the list of all the used fields by the current filter
@@ -456,9 +456,9 @@ class FiltersLib
// Checks the parameter appliedFilter
if (!isEmptyString($appliedFilter))
{
// Retrives all the used fields by the current filter
// Retrieves all the used fields by the current filter
$fields = $this->getSessionElement(self::SESSION_FIELDS);
// Retrives the applied filters by the current filter
// Retrieves the applied filters by the current filter
$filters = $this->getSessionElement(self::SESSION_FILTERS);
// Checks that the given applied filter is present in the list of all the used fields by the current filter
@@ -493,7 +493,7 @@ class FiltersLib
if (isset($appliedFilters) && is_array($appliedFilters)
&& isset($appliedFiltersOperations) && is_array($appliedFiltersOperations))
{
$fields = $this->getSessionElement(self::SESSION_FIELDS); // Retrives all the used fields by the current filter
$fields = $this->getSessionElement(self::SESSION_FIELDS); // Retrieves all the used fields by the current filter
// Checks that the given applied filters are present in all the used fields by the current filter
if (!array_diff($appliedFilters, $fields))
@@ -544,9 +544,9 @@ class FiltersLib
// Checks the parameter filter
if (!isEmptyString($filter))
{
// Retrives all the used fields by the current filter
// Retrieves all the used fields by the current filter
$fields = $this->getSessionElement(self::SESSION_FIELDS);
// Retrives the applied filters by the current filter
// Retrieves the applied filters by the current filter
$filters = $this->getSessionElement(self::SESSION_FILTERS);
// Checks that the given applied filter is present in the list of all the used fields by the current filter
@@ -619,7 +619,7 @@ class FiltersLib
// Generates the "column" property
$jsonDeifinition->columns = array();
$selectedFields = $this->getSessionElement(self::SESSION_SELECTED_FIELDS); // retrived the selected fields
$selectedFields = $this->getSessionElement(self::SESSION_SELECTED_FIELDS); // retrieved the selected fields
for ($i = 0; $i < count($selectedFields); $i++)
{
// Each element is an object with a property called "name"
application/libraries/MessageLib.php
+1 -1
View File
@@ -297,7 +297,7 @@ class MessageLib
$result = $this->_ci->PersonModel->load($receiver_id);
if (hasData($result))
{
// Retrives the language of the logged user
// Retrieves the language of the logged user
$sprache = getUserLanguage();
// Loads template data
application/libraries/NavigationLib.php
+4 -4
View File
@@ -88,7 +88,7 @@ class NavigationLib
}
/**
* Wrapper method to the session helper funtions to retrive the whole session for this navigation widget
* Wrapper method to the session helper funtions to retrieve the whole session for this navigation widget
*/
public function getSessionMenu()
{
@@ -103,7 +103,7 @@ class NavigationLib
}
/**
* Wrapper method to the session helper funtions to retrive the whole session for this navigation widget
* Wrapper method to the session helper funtions to retrieve the whole session for this navigation widget
*/
public function getSessionHeader()
{
@@ -118,7 +118,7 @@ class NavigationLib
}
/**
* Wrapper method to the session helper funtions to retrive one element from the session of this navigation widget
* Wrapper method to the session helper funtions to retrieve one element from the session of this navigation widget
*/
public function getSessionElementMenu($name)
{
@@ -133,7 +133,7 @@ class NavigationLib
}
/**
* Wrapper method to the session helper funtions to retrive one element from the session of this navigation widget
* Wrapper method to the session helper funtions to retrieve one element from the session of this navigation widget
*/
public function getSessionElementHeader($name)
{
application/libraries/PermissionLib.php
+2 -2
View File
@@ -100,7 +100,7 @@ class PermissionLib
* - convert the required permissions to an array if needed
* - loops through the required permissions
* - checks if the permission is well formatted
* - retrives permission and required access type from the $requiredPermissions array
* - retrieves permission and required access type from the $requiredPermissions array
* - checks if the required access type is compliant with the HTTP method (GET => r, POST => w)
* - if the user has one of the permissions than exit the loop
* - checks if the user has the same required permissiond with the same required access type
@@ -142,7 +142,7 @@ class PermissionLib
// Checks if the permission is well formatted
if (strpos($permissions[$pCounter], PermissionLib::PERMISSION_SEPARATOR) !== false)
{
// Retrives permission and required access type from the $requiredPermissions array
// Retrieves permission and required access type from the $requiredPermissions array
list($permission, $requiredAccessType) = explode(PermissionLib::PERMISSION_SEPARATOR, $permissions[$pCounter]);
$accessType = '';
application/libraries/PhrasesLib.php
+4 -4
View File
@@ -5,7 +5,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
class PhrasesLib
{
private $_ci; // Code igniter instance
private $_phrases; // Contains the retrived phrases
private $_phrases; // Contains the retrieved phrases
/**
* Loads parser library
@@ -89,7 +89,7 @@ class PhrasesLib
}
/**
* getPhrases() - Retrives phrases from the DB
* getPhrases() - Retrieves phrases from the DB
* The given parameter are the same needed to read from the table system.tb_phrase
*/
public function getPhrases($app, $sprache, $phrase = null, $orgeinheit_kurzbz = null, $orgform_kurzbz = null, $blockTags = null)
@@ -177,7 +177,7 @@ class PhrasesLib
}
/**
* Retrives a phrases from the the property _phrases with the given parameters
* Retrieves a phrases from the the property _phrases with the given parameters
* It also replace parameters inside the phrase if they are provided
* @param string $category Category name which is used to categorize the phrase.
* @param string $phrase Phrase name.
@@ -241,7 +241,7 @@ class PhrasesLib
$categories = array($categories);
}
// Retrives the language of the logged user
// Retrieves the language of the logged user
$language = getUserLanguage(count($parameters) == 2 ? $parameters[1] : null);
// If only categories is not an empty array then loads phrases
application/libraries/UDFLib.php
+2 -2
View File
@@ -43,7 +43,7 @@ class UDFLib
const CHKBOX_TYPE = 'checkbox'; // UDF checkbox type
const PHRASES_APP_NAME = 'core'; // Name of the app parameter used to retrive phrases
const PHRASES_APP_NAME = 'core'; // Name of the app parameter used to retrieve phrases
private $_ci; // Code igniter instance
@@ -620,7 +620,7 @@ class UDFLib
{
$parameters = $jsonSchema->{UDFLib::LIST_VALUES}->enum;
}
// If the list of values to show should be retrived with a SQL statement
// If the list of values to show should be retrieved with a SQL statement
elseif (isset($jsonSchema->{UDFLib::LIST_VALUES}->sql))
{
// UDFModel is loaded in method _loadUDF that is called before the current method