update v1.0.6.2

This commit is contained in:
sujitprasad
2016-02-18 20:52:44 +05:30
parent 69f07859aa
commit c4a6a2465f
51 changed files with 16750 additions and 2801 deletions

View File

@@ -51,7 +51,7 @@ class LanguageController extends Controller {
// return Cache::get('language');
//} else return 'false';
// Cache::put('language',$)
$path = '../resources/lang'; // Path to check available language packages
$path = base_path('resources/lang'); // Path to check available language packages
if (array_key_exists($lang, Config::get('languages')) && in_array($lang, scandir($path))) {
// dd(array_key_exists($lang, Config::get('languages')));
// app()->setLocale($lang);
@@ -86,7 +86,7 @@ class LanguageController extends Controller {
* @return type
*/
public function getLanguages() {
$path = '../resources/lang';
$path = base_path('resources/lang');
$values = scandir($path); //Extracts names of directories present in lang directory
$values = array_slice($values, 2); // skips array element $value[0] = '.' & $value[1] = '..'
return \Datatable::collection(new Collection($values))
@@ -143,7 +143,7 @@ class LanguageController extends Controller {
//Checking if package already exists or not in lang folder
$path = '../resources/lang';
$path = base_path('resources/lang');
if (in_array(strtolower(Input::get('iso-code')), scandir($path))) {
//sending back with error message
@@ -207,7 +207,7 @@ class LanguageController extends Controller {
*/
public function deleteLanguage($lang) {
if ($lang !== App::getLocale()) {
$deletePath = '../resources/lang/' . $lang; //define file path to delete
$deletePath = base_path('resources/lang') . $lang; //define file path to delete
$success = File::deleteDirectory($deletePath); //remove extracted folder and it's subfolder from lang
if ($success) {
//sending back with success message

View File

@@ -973,12 +973,12 @@ class TicketController extends Controller {
// if (Mail::send('emails.pass', ['password' => $password, 'name' => $username, 'from'=>$company,'emailadd' => $emailadd], function ($message) use ($emailadd, $username,$company) {
// $message->to($emailadd, $username)->subject('Welcome to '.$company.' helpdesk');
// })) {
try {
// try {
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => 'Welcome to ' . $company . ' helpdesk', 'scenario' => 'registration-notification'], $template_variables = ['user' => $username, 'email_address' => $emailadd, 'user_password' => $password]);
} catch (\Exception $e) {
// } catch (\Exception $e) {
// return 0;
}
// }
// $message->to($emailadd, $username)->subject('Welcome to '.$company.' helpdesk');
// })) {
// need to do something here....

View File

@@ -149,7 +149,7 @@ class InstallerApiController extends Controller {
$smtpfilepath = "\App\Http\Controllers\Common\SettingsController::smtp()";
$lfmpath = "url('photos').'/'";
$path22 = app_path('Http/routes.php');
$path23 = app_path('config/lfm.php');
$path23 = base_path('config/lfm.php');
$content23 = File::get($path22);
$content24 = File::get($path23);
$content23 = str_replace('"%smtplink%"', $smtpfilepath, $content23);

View File

@@ -44,10 +44,6 @@ class InstallController extends Controller {
* @return type view
*/
public function licence() {
// checking if the installation is running for the first time or not
// if (Session::get('step5') == 'step5') {
// return Redirect::route('account');
// }
// checking if the installation is running for the first time or not
if (Config::get('database.install') == '%0%') {
return view('themes/default1/installer/helpdesk/view1');
@@ -81,10 +77,6 @@ class InstallController extends Controller {
* @return type view
*/
public function prerequisites() {
// checking if the installation is running for the first time or not
// if (Session::get('step5') == 'step5') {
// return Redirect::route('account');
// }
// checking if the installation is running for the first time or not
if (Config::get('database.install') == '%0%') {
if (Session::get('step1') == 'step1') {
@@ -113,10 +105,6 @@ class InstallController extends Controller {
* @return type view
*/
public function localization() {
// checking if the installation is running for the first time or not
// if (Session::get('step5') == 'step5') {
// return Redirect::route('account');
// }
// checking if the installation is running for the first time or not
if (Config::get('database.install') == '%0%') {
if (Session::get('step2') == 'step2') {
@@ -152,10 +140,6 @@ class InstallController extends Controller {
* @return type view
*/
public function configuration() {
// checking if the installation is running for the first time or not
// if (Session::get('step5') == 'step5') {
// return Redirect::route('account');
// }
// checking if the installation is running for the first time or not
if (Config::get('database.install') == '%0%') {
if (Session::get('step2') == 'step2') {
@@ -176,7 +160,13 @@ class InstallController extends Controller {
public function configurationcheck() {
Session::put('step4', 'step4');
// dd(Input::get('default'));
// dd(Input::get('host'));
// dd(Input::get('databasename'));
// dd(Input::get('username'));
// dd(Input::get('password'));
// dd(Input::get('port'));
Session::put('default', Input::get('default'));
Session::put('host', Input::get('host'));
Session::put('databasename', Input::get('databasename'));

View File

@@ -272,7 +272,7 @@ Route::group(['middleware' => 'role.agent', 'middleware' => 'auth'], function ()
Route::patch('/ticket/assign/{id}', ['as' => 'assign.ticket', 'uses' => 'Agent\helpdesk\TicketController@assign']); /* Patch Ticket assigned to whom */
Route::patch('/ticket/post/edit/{id}', ['as' => 'ticket.post.edit', 'uses' => 'Agent\helpdesk\TicketController@ticket_edit_post']); /* Patchi Ticket Edit */
Route::patch('/ticket/post/edit/{id}', ['as' => 'ticket.post.edit', 'uses' => 'Agent\helpdesk\TicketController@ticketEditPost']); /* Patchi Ticket Edit */
Route::get('/ticket/print/{id}', ['as' => 'ticket.print', 'uses' => 'Agent\helpdesk\TicketController@ticket_print']); /* Get Print Ticket */