Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updated Bootstrap to 3.4.1 for vulnerability reasons, and others #698

Closed
wants to merge 1 commit into from
Closed

updated Bootstrap to 3.4.1 for vulnerability reasons, and others #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions .browserslistrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
> 1%
ie >= 8
edge >= 15
ie_mob >= 10
ff >= 45
chrome >= 45
safari >= 7
opera >= 23
ios >= 7
android >= 4
bb >= 10
271 changes: 136 additions & 135 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,159 +1,160 @@
'use strict';
module.exports = function (grunt) {

const sass = require('node-sass');

// Load grunt tasks automatically
require('load-grunt-tasks')(grunt);

// MODULES

grunt.config('clean', {
basic: [
'assets/**/*.css', 'assets/**/*.css.map', '!assets/core/css/custom.css', '!assets/core/css/custom-pdf.css', // CSS
'assets/core/js/*.js', '!assets/core/js/scripts.js', '!assets/core/js/jquery-ui.js', // JS
'assets/core/fonts/*', '!assets/core/fonts/.gitignore' // Fonts
],
build: ['assets/default/js/dependencies.js', 'assets/default/js/legacy.js']
});
grunt.initConfig({
clean: {
basic: [
'assets/**/*.css', 'assets/**/*.css.map', '!assets/core/css/custom.css', '!assets/core/css/custom-pdf.css', // CSS
'assets/core/js/*.js', '!assets/core/js/scripts.js', '!assets/core/js/jquery-ui.js', // JS
'assets/core/fonts/*', '!assets/core/fonts/.gitignore' // Fonts
],
build: ['assets/default/js/dependencies.js', 'assets/default/js/legacy.js']
},

grunt.config('sass', {
dev: {
options: {
outputStyle: 'extended',
sourceMap: true
sass: {
dev: {
options: {
implementation: sass,
outputStyle: 'extended',
sourceMap: true
},
files: grunt.file.expandMapping(['assets/**/sass/*.scss'], 'css', {
rename: function (dest, matched) {
return matched.replace(/\/sass\//, '/' + dest + '/').replace(/\.scss$/, '.css');
}
})
},
files: grunt.file.expandMapping(['assets/**/sass/*.scss'], 'css', {
rename: function (dest, matched) {
return matched.replace(/\/sass\//, '/' + dest + '/').replace(/\.scss$/, '.css');
}
})
build: {
options: {
outputStyle: 'compressed'
},
files: grunt.file.expandMapping(['assets/**/sass/*.scss'], 'css', {
rename: function (dest, matched) {
return matched.replace(/\/sass\//, '/' + dest + '/').replace(/\.scss$/, '.css');
}
})
}
},
build: {
options: {
outputStyle: 'compressed'
},
files: grunt.file.expandMapping(['assets/**/sass/*.scss'], 'css', {
rename: function (dest, matched) {
return matched.replace(/\/sass\//, '/' + dest + '/').replace(/\.scss$/, '.css');
}
})
}
});

grunt.config('postcss', {
dev: {
options: {
map: true,
processors: [
require('autoprefixer')({
browsers: 'last 3 version'
})
postcss: {
dev: {
options: {
map: true,
processors: [
require('autoprefixer')
]
},
src: [
'assets/**/css/*.css',
'!assets/core/css/custom.css',
'!assets/core/css/custom-pdf.css'
]
},
src: [
'assets/**/css/*.css',
'!assets/core/css/custom.css',
'!assets/core/css/custom-pdf.css'
]
},
build: {
options: {
map: false,
processors: [
require('autoprefixer')({
browsers: 'last 3 version'
})
build: {
options: {
map: false,
processors: [
require('autoprefixer')
]
},
src: [
'assets/**/css/*.css',
'!assets/core/css/custom.css',
'!assets/core/css/custom-pdf.css'
]
},
src: [
'assets/**/css/*.css',
'!assets/core/css/custom.css',
'!assets/core/css/custom-pdf.css'
]
}
});

grunt.config('concat', {
legacy: {
src: [
'node_modules/html5shiv/dist/html5shiv.js'
],
dest: 'assets/core/js/legacy.js'
},
dependencies: {
src: [
'node_modules/jquery/dist/jquery.js',
'node_modules/js-cookie/src/js.cookie.js',
'assets/core/js/jquery-ui.js',
'node_modules/bootstrap-sass/assets/javascripts/bootstrap.js',
'node_modules/bootstrap-datepicker/js/bootstrap-datepicker.js',
'node_modules/select2/dist/js/select2.full.js',
'node_modules/dropzone/dist/dropzone.js',
'node_modules/clipboard/dist/clipboard.js'
],
dest: 'assets/core/js/dependencies.js'
},
zxcvbn: {
src: [
'node_modules/zxcvbn/dist/zxcvbn.js'
],
dest: 'assets/core/js/zxcvbn.js'
}
});

grunt.config('uglify', {
build: {
files: {
'assets/core/js/legacy.min.js': ['assets/core/js/legacy.js'],
'assets/core/js/dependencies.min.js': ['assets/core/js/dependencies.js'],
'assets/core/js/scripts.min.js': ['assets/core/js/scripts.js']
}
}
});

grunt.config('copy', {
datepickerlocale: {
expand: true,
flatten: true,
src: ['node_modules/bootstrap-datepicker/js/locales/**'],
dest: 'assets/core/js/locales/',
filter: 'isFile'
},
select2locale: {
expand: true,
flatten: true,
src: ['node_modules/select2/dist/js/i18n/**'],
dest: 'assets/core/js/locales/select2/',
filter: 'isFile'
},
fontawesome: {
expand: true,
flatten: true,
src: ['node_modules/font-awesome/fonts/*'],
dest: 'assets/core/fonts'
},
devjs: {
files: [{
cwd: 'assets/core/js/',

concat: {
legacy: {
src: [
'*.js', '!jquery-ui.js'
'node_modules/html5shiv/dist/html5shiv.js'
],
dest: 'assets/core/js/',
expand: true,
rename: function(dest, src) {
return (dest + src).replace('.js', '.min.js');
dest: 'assets/core/js/legacy.js'
},
dependencies: {
src: [
'node_modules/jquery/dist/jquery.js',
'node_modules/js-cookie/src/js.cookie.js',
'assets/core/js/jquery-ui.js',
'node_modules/bootstrap-sass/assets/javascripts/bootstrap.js',
'node_modules/bootstrap-datepicker/js/bootstrap-datepicker.js',
'node_modules/select2/dist/js/select2.full.js',
'node_modules/dropzone/dist/dropzone.js',
'node_modules/clipboard/dist/clipboard.js'
],
dest: 'assets/core/js/dependencies.js'
},
zxcvbn: {
src: [
'node_modules/zxcvbn/dist/zxcvbn.js'
],
dest: 'assets/core/js/zxcvbn.js'
}
},

uglify: {
build: {
files: {
'assets/core/js/legacy.min.js': ['assets/core/js/legacy.js'],
'assets/core/js/dependencies.min.js': ['assets/core/js/dependencies.js'],
'assets/core/js/scripts.min.js': ['assets/core/js/scripts.js']
}
}]
}
});
}
},

grunt.config('watch', {
sass: {
files: "assets/**/*.scss",
tasks: ['sass:dev', 'postcss:dev']
copy: {
datepickerlocale: {
expand: true,
flatten: true,
src: ['node_modules/bootstrap-datepicker/js/locales/**'],
dest: 'assets/core/js/locales/',
filter: 'isFile'
},
select2locale: {
expand: true,
flatten: true,
src: ['node_modules/select2/dist/js/i18n/**'],
dest: 'assets/core/js/locales/select2/',
filter: 'isFile'
},
fontawesome: {
expand: true,
flatten: true,
src: ['node_modules/font-awesome/fonts/*'],
dest: 'assets/core/fonts'
},
devjs: {
files: [{
cwd: 'assets/core/js/',
src: [
'*.js', '!jquery-ui.js'
],
dest: 'assets/core/js/',
expand: true,
rename: function(dest, src) {
return (dest + src).replace('.js', '.min.js');
}
}]
}
},
js: {
files: "assets/core/js/scripts.js",
tasks: ['uglify']

watch: {
sass: {
files: "assets/**/*.scss",
tasks: ['sass:dev', 'postcss:dev']
},
js: {
files: "assets/core/js/scripts.js",
tasks: ['uglify']
}
}
});

Expand Down Expand Up @@ -201,4 +202,4 @@ module.exports = function (grunt) {
'copy:select2locale',
'copy:fontawesome'
]);
};
};
3 changes: 2 additions & 1 deletion application/helpers/trans_helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ function trans($line, $id = '', $default = null)
$current_language = $CI->session->userdata('user_language');

if (empty($current_language) || $current_language == 'system') {
$current_language = get_setting('default_language');
// todo gives error at startup, fix later
$current_language = 'english'; //get_setting('default_language');
}

// Load the default language and translate the string
Expand Down
10 changes: 9 additions & 1 deletion application/third_party/MX/Router.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,18 @@ protected function _set_default_controller()

public function set_class($class)
{
$suffix = $this->config->item('controller_suffix');
// fixed error with HMVC plugin in Codeigniter and php 7
/*$suffix = $this->config->item('controller_suffix');
if (strpos($class, $suffix) === false) {
$class .= $suffix;
}
parent::set_class($class);*/

$suffix = (string) $this->config->item('controller_suffix');
if ($suffix && strpos($class, $suffix) === FALSE) {
$class .= $suffix;
}

parent::set_class($class);
}
}
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
}
],
"require": {
"phpmailer/phpmailer": "^6.0.5",
"mpdf/mpdf": "dev-master",
"phpmailer/phpmailer": "^6.1.4",
"mpdf/mpdf": "^8.0.4",
"vlucas/phpdotenv": "^2.4",
"setasign/fpdi-fpdf": "^1.6.2",
"setasign/fpdi-fpdf": "^2.2.0",
"codeigniter/framework": "3.1.9",
"omnipay/omnipay": "~2.0",
"paragonie/random_compat": "^2.0"
Expand Down
Loading