fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improvemenet name file support

Browse Source
This commit is contained in:
Marco Antonio Nina
2014-10-21 15:35:39 -04:00
parent ff3e14b674
commit 78b73256f2
2 changed files with 230 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
gulliver/system/class.g.php
View File

@@ -5309,7 +5309,8 @@ class G
return $arrayData;
}
public static function buildFrom($configuration, $from = '') {
public static function buildFrom($configuration, $from = '')
{
if (!isset($configuration['MESS_FROM_NAME'])) {
$configuration['MESS_FROM_NAME'] = '';
}
@@ -5352,7 +5353,8 @@ class G
*
*
*/
public function verifyInputDocExtension($InpDocAllowedFiles, $filesName, $filesTmpName){
public function verifyInputDocExtension($InpDocAllowedFiles, $filesName, $filesTmpName)
{
$allowedTypes = explode(", ", $InpDocAllowedFiles);
$flag = 0;
$res = new stdclass();
@@ -5522,7 +5524,8 @@ class G
/**
* Get the actual browser.
*/
public function getActualBrowser(){
public function getActualBrowser ()
{
$browser=array("TRIDENT","IE","OPERA","MOZILLA","NETSCAPE","FIREFOX","SAFARI","CHROME");
$info['browser'] = "OTHER";
@@ -5539,15 +5542,15 @@ class G
$info['version'] = $version;
}
}
$info['browser'] = ($info['browser']=='RV')? 'IE':$info['browser'];
return $info;
}
/**
/*
* Check the browser compativility
*/
public function checkBrowserCompatibility($browser = null, $version = null){
public function checkBrowserCompatibility($browser = null, $version = null)
{
if ($browser == null || $version == null) {
$info = G::getActualBrowser();
$browser = $info['browser'];
@@ -5561,6 +5564,23 @@ class G
}
return false;
}
/*
* $string - The string to sanitize.
* $lowercase - Force the string to lowercase?
* $alpha - If set to *true*, will remove all non-alphanumeric characters.
*/
public function sanitizeString ($string, $lowercase = true, $alpha = false)
{
$strip = array("~", "`", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "=", "+", "[", "{", "]",
"}", "\\", "|", ";", ":", "\"", "'", "‘", "’", "“", "”", "–", "—",
"—", "–", ",", "<", ".", ">", "/", "?");
$clean = trim(str_replace($strip, "", strip_tags($string)));
$clean = preg_replace('/\s+/', "-", $clean);
$clean = ($alpha) ? preg_replace("/[^a-zA-Z0-9]/", "", $clean) : $clean ;
$clean = ($force_lowercase) ? (function_exists('mb_strtolower')) ? mb_strtolower($clean, 'UTF-8') : strtolower($clean) : $clean;
return $clean;
}
}
/**

12
workflow/engine/controllers/adminProxy.php
View File

@@ -1399,13 +1399,21 @@ class adminProxy extends HttpProxyController
//Database server Version (MySQL version)
$installer = new Installer();
$systemInfo = $installer->getSystemInfo();
$params['dbVersion'] = mysql_get_server_info();//$systemInfo->mysql->version;
try {
$params['dbVersion'] = mysql_get_server_info();
} catch (Exception $e) {
$params['dbVersion'] = '';
}
//PHP Version
$params['php'] = $systemInfo->php->version;
//Apache - IIS Version
try {
$params['apache'] = apache_get_version();
} catch (Exception $e) {
$params['apache'] = '';
}
//Installed Plugins (license info?)
$arrayAddon = array ();
@@ -1472,7 +1480,7 @@ class adminProxy extends HttpProxyController
//Country/city (Timezone)
$params["Timezone"] = (defined('TIME_ZONE') && TIME_ZONE != "Unknown") ? TIME_ZONE : date_default_timezone_get();
$support = PATH_DATA_SITE . SYS_SYS . '-' . date('YmdHis') . '.spm';
$support = PATH_DATA_SITE . G::sanitizeString($licenseManager->info['FIRST_NAME'] . '-' . $licenseManager->info['LAST_NAME'] . '-' . SYS_SYS . '-' . date('YmdHis'), false, false) . '.spm';
file_put_contents($support, serialize($params));
G::streamFile($support, true);
G::rm_dir($support);