Skip to content

Commit

Permalink
EasyPIBA 5
Browse files Browse the repository at this point in the history 
Added composer
  • Loading branch information
@al3x2508
al3x2508 committed Dec 22, 2017
1 parent e63600f commit cf92b17
Show file tree
Hide file tree
Showing 4,334 changed files with 789 additions and 571,319 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
9 changes: 8 additions & 1 deletion .htaccess
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,21 @@ RewriteEngine On
#Uncomment next 2 lines if you want to have always redirect with www subdomain
#RewriteCond %{HTTP_HOST} !^www\.
#RewriteRule ^(.*)$ http://www.%{HTTP_HOST}/$1 [R=301,L]
RewriteRule ^css/main.css Utils/scripts.php [L]
RewriteRule ^js/jquery.min.js vendor/components/jquery/jquery.min.js [L]
RewriteRule ^js/jquery-ui.min.js vendor/components/jqueryui/jquery-ui.min.js [L]
RewriteRule ^css/(.*)$ assets/css/$1 [NC,L]
RewriteRule ^js/(.*)$ assets/js/$1 [NC,L]
RewriteRule ^fonts/(.*)$ assets/fonts/$1 [NC,L]
RewriteRule ^img/(.*)$ assets/img/$1 [NC,L]

RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^logout$ index.php?logout=true [L]
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^scripts.js Utils/scripts.php [L]
RewriteRule ^scripts.css Utils/scripts.php [L]
RewriteRule ^css/main.css Utils/scripts.php [L]
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule . index.php [L]
Expand Down
6 changes: 3 additions & 3 deletions Controller/Mail.class.php
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
namespace Controller;
require(dirname(dirname(__FILE__)) . '/PHPMailer/PHPMailerAutoload.php');
require(dirname(dirname(__FILE__)) . '/PHPMailer/class.smtp.php');
class Mail extends \PHPMailer {
use PHPMailer\PHPMailer\PHPMailer;

class Mail extends PHPMailer {
public function __construct() {
$this->isSMTP();
$this->SMTPDebug = 0;
Expand Down
3 changes: 2 additions & 1 deletion Model/Model.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,8 @@ public function get($whereOp = 'AND', $ignore_password = false) {
$nc = new Model($table);
$c->$table = $nc;
}
$c->$table->$matches[2] = $val;
$tc = $matches[2];
$c->$table->$tc = $val;
}
else $c->$key = $val;
}
Expand Down
4 changes: 2 additions & 2 deletions Module/Administrators/Admin/Admins.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ public function __set($key, $value) {
public function __construct() {
$this->title = __('Edit administrators');
$this->h1 = __('Edit administrators');
$this->js = array('plugins/datatables/jquery.dataTables.js','plugins/datatables/fnReloadAjax.js','plugins/datatables/dataTables.bootstrap.js','plugins/iCheck/icheck.min.js','js/jsall.js','../Module/Administrators/Admin/administrators.js');
$this->css = array('plugins/datatables/dataTables.bootstrap.css', 'plugins/iCheck/all.css');
$this->js = array('../vendor/datatables/datatables/media/js/jquery.dataTables.min.js','../vendor/datatables/datatables/media/js/dataTables.bootstrap.min.js','../vendor/almasaeed2010/adminlte/plugins/iCheck/icheck.min.js','js/jsall.js','../Module/Administrators/Admin/administrators.js');
$this->css = array('../vendor/datatables/datatables/media/css/dataTables.bootstrap.min.css', '../vendor/almasaeed2010/adminlte/plugins/iCheck/all.css');
$htmlPerms = '';
$permissions = new Model('permissions');
$permissions = $permissions->get();
Expand Down
2 changes: 0 additions & 2 deletions Module/JSON/Admin.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@ public function excelExport() {
}
}
}
/** Include PHPExcel */
require_once(dirname(dirname(dirname(__FILE__))) . '/Utils/PHPExcel.php');
$objPHPExcel = new \PHPExcel();
//Set document properties
$objPHPExcel->getProperties()->setCreator(_APP_NAME_)->setLastModifiedBy(_APP_NAME_)->setTitle("Export " . $this->instanceName)->setSubject("Export " . $this->instanceName)->setDescription("Export " . $this->instanceName)->setKeywords(_APP_NAME_ . "export data " . $this->instanceName)->setCategory(_APP_NAME_ . " " . $this->instanceName);
Expand Down
4 changes: 2 additions & 2 deletions Module/Media/Admin/Act.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use Controller\AdminController;
use Controller\AdminAct;
use Model\Model;
use Utils\PHPThumb\GD;
use \PHPThumb\GD;

require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/Utils/functions.php');

Expand Down Expand Up @@ -108,7 +108,7 @@ private static function uploadImg($file, $return = false) {
$path_parts = pathinfo($target_file);
$thumb_file_name = 'thumb' . $path_parts['filename'] . '.jpg';
$thumb_target_file = $target_dir . $thumb_file_name;
$thumb = new \Utils\PHPThumb\GD($target_file);
$thumb = new \PHPThumb\GD($target_file);
$thumb->resize(100, 100);
$thumb->save($thumb_target_file, 'jpg');
$targetThumbDir = _FOLDER_URL_ . 'uploads/';
Expand Down
4 changes: 2 additions & 2 deletions Module/Media/Admin/Media.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ public function __set($key, $value) {
public function __construct() {
$this->title = __('Media');
$this->h1 = __('Media');
$this->js = array('plugins/datatables/jquery.dataTables.js','plugins/datatables/fnReloadAjax.js','plugins/datatables/dataTables.bootstrap.js','js/jsall.js','../Module/Media/Admin/media.js');
$this->css = array('plugins/datatables/dataTables.bootstrap.css');
$this->js = array('../vendor/datatables/datatables/media/js/jquery.dataTables.min.js','../vendor/datatables/datatables/media/js/dataTables.bootstrap.min.js','js/jsall.js','../Module/Media/Admin/media.js');
$this->css = array('../vendor/datatables/datatables/media/css/dataTables.bootstrap.min.css');
$this->content = '<div class="box">
<div class="box-header"><h3 class="box-title">' . __('Media') . '</h3></div>
<div class="box-body">
Expand Down
2 changes: 1 addition & 1 deletion Module/News/Admin/Act.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use Controller\AdminController;
use Model\Model;
use Module\News\Setup;
use Utils\PHPThumb\GD;
use \PHPThumb\GD;
use Utils\Util;

require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/Utils/functions.php');
Expand Down
4 changes: 2 additions & 2 deletions Module/News/Admin/AdminPage.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ public function output() {
$selected = ($language->code == _DEFAULT_LANGUAGE_)?' selected':'';
$languageOptions .= "<option value=\"{$language->code}\"{$selected}>" . $language->name . "</option>";
}
$page->js = array('js/combobox.js','plugins/datatables/jquery.dataTables.js','plugins/datatables/fnReloadAjax.js','plugins/datatables/dataTables.bootstrap.js','plugins/ckeditor/ckeditor.js','bower_components/select2/dist/js/select2.full.min.js','js/jsall.js','../Module/News/Admin/news.js');
$page->css = array('bower_components/select2/dist/css/select2.min.css','plugins/datatables/dataTables.bootstrap.css');
$page->js = array('js/combobox.js','../vendor/datatables/datatables/media/js/jquery.dataTables.min.js','../vendor/datatables/datatables/media/js/dataTables.bootstrap.min.js','../vendor/ckeditor/ckeditor/ckeditor.js','../vendor/almasaeed2010/adminlte/bower_components/select2/dist/js/select2.full.min.js','js/jsall.js','../Module/News/Admin/news.js');
$page->css = array('../vendor/almasaeed2010/adminlte/bower_components/select2/dist/css/select2.min.css','../vendor/datatables/datatables/media/css/dataTables.bootstrap.min.css');
$page->content = '<div class="box">
<div class="box-header"><h3 class="box-title">' . __('Edit news') . '</h3></div>
<div class="box-body">
Expand Down
4 changes: 2 additions & 2 deletions Module/Pages/Admin/Menu.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ public function __set($key, $value) {
public function __construct() {
$this->title = __('Edit menu');
$this->h1 = __('Edit menu');
$this->js = array('plugins/nestedSortable/jquery.nestedSortable.js','bower_components/select2/dist/js/select2.full.min.js','js/jsall.js','../Module/Pages/Admin/menu.js');
$this->css = array('bower_components/select2/dist/css/select2.min.css','../Module/Pages/Admin/menu.css');
$this->js = array('../assets/js/jquery.nestedSortable.js','../vendor/almasaeed2010/adminlte/bower_components/select2/dist/js/select2.full.min.js','js/jsall.js','../Module/Pages/Admin/menu.js');
$this->css = array('../vendor/almasaeed2010/adminlte/bower_components/select2/dist/css/select2.min.css','../Module/Pages/Admin/menu.css');
$pages = new Model('pages');
$pages->groupBy('language');
$pages->order('language ASC');
Expand Down
4 changes: 2 additions & 2 deletions Module/Pages/Admin/Pages.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ public function __construct() {
$selected = ($language->code == _DEFAULT_LANGUAGE_)?' selected':'';
$languageOptions .= "<option value=\"{$language->code}\"{$selected}>" . $language->name . "</option>";
}
$this->js = array('plugins/datatables/jquery.dataTables.js','plugins/datatables/fnReloadAjax.js','plugins/datatables/dataTables.bootstrap.js','plugins/ckeditor/ckeditor.js','bower_components/select2/dist/js/select2.full.min.js','js/jsall.js','../Module/Pages/Admin/pages.js');
$this->css = array('bower_components/select2/dist/css/select2.min.css', 'plugins/datatables/dataTables.bootstrap.css');
$this->js = array('../vendor/datatables/datatables/media/js/jquery.dataTables.min.js','../vendor/datatables/datatables/media/js/dataTables.bootstrap.min.js','../vendor/ckeditor/ckeditor/ckeditor.js','../vendor/almasaeed2010/adminlte/bower_components/select2/dist/js/select2.full.min.js','js/jsall.js','../Module/Pages/Admin/pages.js');
$this->css = array('../vendor/almasaeed2010/adminlte/bower_components/select2/dist/css/select2.min.css', '../vendor/datatables/datatables/media/css/dataTables.bootstrap.min.css');
$this->content = '<div class="box">
<div class="box-header"><h3 class="box-title">' . __('Edit pages') . '</h3></div>
<div class="box-body">
Expand Down
3 changes: 2 additions & 1 deletion Module/Pages/Admin/pages.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ function loadData(aoData) {
if($("#menutextf").val()!='') filters.filters['menu_text'] = $("#menutextf").val();
return filters;
}
$(window).on('load', function () {
$(document).ready(function() {
CKEDITOR.plugins.addExternal('imageuploader', adminfolder + 'plugins/imageuploader/');
CKEDITOR.replace('edcontent', {
allowedContent: true,
extraPlugins: 'imageuploader,justify'
Expand Down
2 changes: 1 addition & 1 deletion Module/Testimonials/Admin/Act.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use Controller\AdminAct;
use Controller\AdminController;
use Model\Model;
use Utils\PHPThumb\GD;
use \PHPThumb\GD;

require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/Utils/functions.php');

Expand Down
4 changes: 2 additions & 2 deletions Module/Testimonials/Admin/AdminPage.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ public function output() {
$page = new \stdClass();
$page->title = __('Testimonials');
$page->h1 = __('Testimonials');
$page->js = array('plugins/datatables/jquery.dataTables.js','plugins/datatables/fnReloadAjax.js','plugins/datatables/dataTables.bootstrap.js','plugins/ckeditor/ckeditor.js','js/jsall.js','../Module/Testimonials/Admin/testimonials.js');
$page->css = array('plugins/datatables/dataTables.bootstrap.css');
$page->js = array('../vendor/datatables/datatables/media/js/jquery.dataTables.min.js','../vendor/datatables/datatables/media/js/dataTables.bootstrap.min.js','../vendor/ckeditor/ckeditor/ckeditor.js','js/jsall.js','../Module/Testimonials/Admin/testimonials.js');
$page->css = array('../vendor/datatables/datatables/media/css/dataTables.bootstrap.min.css');
$page->content = '<div class="box">
<div class="box-header"><h3 class="box-title">' . __('Testimonials') . '</h3></div>
<div class="box-body">
Expand Down
4 changes: 2 additions & 2 deletions Module/Users/Admin/AdminPage.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ public function output() {
$page->title = __('Users');
$page->h1 = __('Users');
foreach($countries AS $country) $countriesOptions .= '<option value="' . $country->id . '">' . $country->name . '</option>'.PHP_EOL;
$page->js = array('plugins/datatables/jquery.dataTables.js','plugins/datatables/fnReloadAjax.js','plugins/datatables/dataTables.bootstrap.js','js/jsall.js','../Module/Users/Admin/users.js');
$page->css = array('plugins/datatables/dataTables.bootstrap.css');
$page->js = array('../vendor/datatables/datatables/media/js/jquery.dataTables.min.js','../vendor/datatables/datatables/media/js/dataTables.bootstrap.min.js','js/jsall.js','../Module/Users/Admin/users.js');
$page->css = array('../vendor/datatables/datatables/media/css/dataTables.bootstrap.min.css');
$page->content = '<div class="box">
<div class="box-header"><h3 class="box-title">' . __('Users') . '</h3></div>
<div class="box-body">
Expand Down
2 changes: 1 addition & 1 deletion Module/Users/MyAccountPage.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class MyAccountPage {
public $ogimage = '';
public $h1 = '';
public $breadcrumbs = array();
public $js = array('validate.min.js', '../Module/Users/my-account.js');
public $js = array('validate.min.js', 'Module/Users/my-account.js');
public $css = array('cinput.css');
public $visible = true;

Expand Down
49 changes: 0 additions & 49 deletions PHPMailer/PHPMailerAutoload.php
View file

This file was deleted.

Loading

0 comments on commit cf92b17

Please sign in to comment.