diff --git a/www/admin/qq_file_upload_ajax.php b/www/admin/qq_file_upload_ajax.php index 345a1944..5800f0c2 100755 --- a/www/admin/qq_file_upload_ajax.php +++ b/www/admin/qq_file_upload_ajax.php @@ -1,7 +1,5 @@ StringByteFormat(ini_get('upload_max_filesize')); $allowedExtensions = array ('csv', 'zip', 'jpg', 'pdf', 'bz2'); $sizeLimit = $MAX_UPLOAD_SIZE; // as set in php ini $base->debug('AJAX UPLOAD', 'Size: '.$sizeLimit.', Memory Limit: '.ini_get('memory_limit')); -$uploader = new CoreLibs\Upload\qqFileUploader($allowedExtensions, $sizeLimit); +$uploader = new FileUpload\qqFileUploader($allowedExtensions, $sizeLimit); // either in post or get $_action= $_POST['action'] ? $_POST['action'] : $_GET['action']; $_task_uid = $_POST['task_uid'] ? $_POST['task_uid'] : $_GET['task_uid']; diff --git a/www/includes/table_arrays/array_edit_access.php b/www/includes/table_arrays/array_edit_access.php index 52de15cb..08d55360 100644 --- a/www/includes/table_arrays/array_edit_access.php +++ b/www/includes/table_arrays/array_edit_access.php @@ -9,19 +9,19 @@ $edit_access = array ( ), 'name' => array ( 'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '', - 'output_name' => $this->l->__('Access Group Name'), + 'output_name' => 'Access Group Name', 'mandatory' => 1, 'type' => 'text', 'error_check' => 'alphanumericspace|unique' ), 'description' => array ( 'value' => isset($GLOBALS['description']) ? $GLOBALS['description'] : '', - 'output_name' => $this->l->__('Description'), + 'output_name' => 'Description', 'type' => 'textarea' ), 'color' => array ( 'value' => isset($GLOBALS['color']) ? $GLOBALS['color'] : '', - 'output_name' => $this->l->__('Color'), + 'output_name' => 'Color', 'mandatory' => 0, 'type' => 'text', 'size' => 6, diff --git a/www/includes/table_arrays/array_edit_menu_group.php b/www/includes/table_arrays/array_edit_menu_group.php index fa6ca45c..b21377ea 100644 --- a/www/includes/table_arrays/array_edit_menu_group.php +++ b/www/includes/table_arrays/array_edit_menu_group.php @@ -9,13 +9,13 @@ $edit_menu_group = array ( ), 'name' => array ( 'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '', - 'output_name' => $this->l->__('Group name'), + 'output_name' => 'Group name', 'mandatory' => 1, 'type' => 'text' ), 'flag' => array ( 'value' => isset($GLOBALS['flag']) ? $GLOBALS['flag'] : '', - 'output_name' => $this->l->__('Flag'), + 'output_name' => 'Flag', 'mandatory' => 1, 'type' => 'text', 'error_check' => 'alphanumeric|unique' diff --git a/www/includes/table_arrays/array_edit_visible_group.php b/www/includes/table_arrays/array_edit_visible_group.php index 80f05855..ea4fe531 100644 --- a/www/includes/table_arrays/array_edit_visible_group.php +++ b/www/includes/table_arrays/array_edit_visible_group.php @@ -9,13 +9,13 @@ $edit_visible_group = array ( ), 'name' => array ( 'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '', - 'output_name' => $this->l->__('Group name'), + 'output_name' => 'Group name', 'mandatory' => 1, 'type' => 'text' ), 'flag' => array ( 'value' => isset($GLOBALS['flag']) ? $GLOBALS['flag'] : '', - 'output_name' => $this->l->__('Flag'), + 'output_name' => 'Flag', 'mandatory' => 1, 'type' => 'text', 'error_check' => 'alphanumeric|unique' diff --git a/www/lib/CoreLibs/ACL/Login.php b/www/lib/CoreLibs/ACL/Login.php index d7e857f7..d7e74564 100644 --- a/www/lib/CoreLibs/ACL/Login.php +++ b/www/lib/CoreLibs/ACL/Login.php @@ -770,6 +770,15 @@ class Login extends \CoreLibs\DB\IO return $is_valid_password; } + // METHOD: loginPasswordForgot + // PARAMS: none + // RETURN: none + // DESC : dummy declare for password forget + private function loginPasswordForgot() + { + // will do some password recovert, eg send email + } + // METHOD: loginSetPasswordMinLength // PARAMS: set the minimum length // RETURN: true/false on success diff --git a/www/lib/CoreLibs/DB/SQL/PgSQL.php b/www/lib/CoreLibs/DB/SQL/PgSQL.php index a7076db6..57cd37ff 100644 --- a/www/lib/CoreLibs/DB/SQL/PgSQL.php +++ b/www/lib/CoreLibs/DB/SQL/PgSQL.php @@ -435,7 +435,7 @@ class PgSQL return $offset; } } else { - $offset = pg_array_parse($text, $output[], $limit, $offset + 1); + $offset = $this->__dbArrayParse($text, $output[], $limit, $offset + 1); } } while ($limit > $offset); } diff --git a/www/lib/CoreLibs/Language/Core/CachedFileReader.php b/www/lib/CoreLibs/Language/Core/CachedFileReader.php index 2823fa68..5d54c3f9 100755 --- a/www/lib/CoreLibs/Language/Core/CachedFileReader.php +++ b/www/lib/CoreLibs/Language/Core/CachedFileReader.php @@ -24,7 +24,7 @@ namespace CoreLibs\Language\Core; // Preloads entire file in memory first, then creates a StringReader // over it (it assumes knowledge of StringReader internals) -class CachedFileReader extends CoreLibs\Language\Core\StringReader +class CachedFileReader extends \CoreLibs\Language\Core\StringReader { public function __construct($filename) { diff --git a/www/lib/CoreLibs/Language/Core/GetTextReader.php b/www/lib/CoreLibs/Language/Core/GetTextReader.php index 061c125c..92b81440 100755 --- a/www/lib/CoreLibs/Language/Core/GetTextReader.php +++ b/www/lib/CoreLibs/Language/Core/GetTextReader.php @@ -369,7 +369,7 @@ class GetTextReader * Detects which plural form to take * * @access private - * @param n count + * @param string count * @return int array index of the right plural form */ private function select_string($n) diff --git a/www/lib/CoreLibs/Output/Form/Generate.php b/www/lib/CoreLibs/Output/Form/Generate.php index 7d14344f..a548fe88 100644 --- a/www/lib/CoreLibs/Output/Form/Generate.php +++ b/www/lib/CoreLibs/Output/Form/Generate.php @@ -923,12 +923,12 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } break; case 'date': // YYYY-MM-DD - if (!check_date($this->table_array[$key]['value'], 1)) { + if (!$this->checkDate($this->table_array[$key]['value'], 1)) { $this->msg .= sprintf($this->l->__('Please enter a vailid date (YYYY-MM-DD) for the %s Field!
'), $this->table_array[$key]['output_name']); } break; case 'time': // HH:MM[:SS] - if (!check_time($this->table_array[$key]['value'])) { + if (!$this->checkDateTime($this->table_array[$key]['value'])) { $this->msg .= sprintf($this->l->__('Please enter a vailid time (HH:MM[:SS]) for the %s Field!
'), $this->table_array[$key]['output_name']); } break; diff --git a/www/lib/CoreLibs/Template/SmartyExtend.php b/www/lib/CoreLibs/Template/SmartyExtend.php index f89a7dbe..abdda138 100644 --- a/www/lib/CoreLibs/Template/SmartyExtend.php +++ b/www/lib/CoreLibs/Template/SmartyExtend.php @@ -25,7 +25,8 @@ class SmartyExtend extends SmartyBC SmartyBC::__construct(); $this->l10n = new \CoreLibs\Language\L10n($lang); // variable variable register - $this->register_modifier('getvar', array(&$this, 'get_template_vars')); + // $this->register_modifier('getvar', array(&$this, 'get_template_vars')); + $this->registerPlugin('modifier', 'getvar', array(&$this, 'get_template_vars')); } } diff --git a/www/lib/FileUpload/qqFileUploader.php b/www/lib/FileUpload/qqFileUploader.php index e73a71b4..810adad5 100755 --- a/www/lib/FileUpload/qqFileUploader.php +++ b/www/lib/FileUpload/qqFileUploader.php @@ -2,8 +2,7 @@ namespace FileUpload; -use \FileUpload\Core\qqUploadedFileForm; -use \FileUpload\Core\qqUploadedFileXhr; +use \FileUpload\Core; class qqFileUploader { @@ -21,9 +20,9 @@ class qqFileUploader $this->checkServerSettings(); if (isset($_GET['qqfile'])) { - $this->file = new qqUploadedFileXhr(); + $this->file = new \FileUpload\Core\qqUploadedFileXhr(); } elseif (isset($_FILES['qqfile'])) { - $this->file = new qqUploadedFileForm(); + $this->file = new \FileUpload\Core\qqUploadedFileForm(); } else { $this->file = false; }