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

- Added methods deleteCustomFilter and _fillCustomFilters to controller InfoCenter

Browse Source 
- Added method deleteCustomFilter to model Filters_model
- Changed parameter filterId to filter_id in FilterWidget, infocenterData
- Changed CSS and JS in views/widgets/navigationMenu.php to allow two links in one menu item
- Changed NavigationMenuWidget to allow two links in one menu item
This commit is contained in:
Paolo
2018-02-09 15:18:44 +01:00
parent 4dec69ae63
commit c57c953eaa
7 changed files with 119 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/helpers/fhc_helper.php
+8 -8
View File
@@ -9,7 +9,7 @@
* @license GPLv3
* @since Version 1.0.0
*/
/**
* FHC Helper
*
@@ -33,7 +33,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
function generateToken($length = 64)
{
// For PHP 7 you can use random_bytes()
if(function_exists('random_bytes'))
if(function_exists('random_bytes'))
{
$token = base64_encode(random_bytes($length));
//base64 is about 33% longer, so we need to truncate the result
@@ -41,7 +41,7 @@ function generateToken($length = 64)
}
// for PHP >=5.3 and <7
if(function_exists('openssl_random_pseudo_bytes'))
if(function_exists('openssl_random_pseudo_bytes'))
{
$token = base64_encode(openssl_random_pseudo_bytes($length, $strong));
// is the token strong enough?
@@ -51,7 +51,7 @@ function generateToken($length = 64)
//fallback to mt_rand if php < 5.3 or no openssl available
$characters = '0123456789';
$characters .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz/+';
$characters .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz/+';
$charactersLength = strlen($characters)-1;
$token = '';
//select some random characters
@@ -96,7 +96,7 @@ function loadResource($path, $resources = null, $subdir = false)
{
$path .= '/';
}
// Loads in $tmpResources all the given resources
$tmpResources = $resources;
if ($resources == null)
@@ -107,7 +107,7 @@ function loadResource($path, $resources = null, $subdir = false)
{
$tmpResources = array($resources);
}
// Loads in $tmpPaths path and eventually the subdirectories
$tmpPaths = array($path);
// NOTE: Used @ to prevent ugly error messages
@@ -133,7 +133,7 @@ function loadResource($path, $resources = null, $subdir = false)
}
closedir($dirHandler);
}
// Loops through the resources
foreach($tmpResources as $tmpResource)
{
@@ -147,4 +147,4 @@ function loadResource($path, $resources = null, $subdir = false)
}
}
}
}
}