Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7717 from turbo124/v5-stable

Browse Source 
Code Cleanup
This commit is contained in:
David Bomba 2022-08-05 17:12:46 +10:00 committed by GitHub
commit 925e860f5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/SelfUpdateController.php
View File

@ -136,15 +136,6 @@ class SelfUpdateController extends BaseController
//clean up old snappdf installations
$this->cleanOldSnapChromeBinaries();
// try{
// $s = new Snappdf;
// $s->getChromiumPath();
// chmod($this->generatePlatformExecutable($s->getChromiumPath()), 0755);
// }
// catch(\Exception $e){
// nlog("I could not set the file permissions for chrome");
// }
$zipFile = new \PhpZip\ZipFile();
$zipFile->openFile($file);
@ -153,14 +144,6 @@ class SelfUpdateController extends BaseController
$zipFile->close();
// $zip = new \ZipArchive;
// $res = $zip->open($file);
// if ($res === TRUE) {
// $zip->extractTo(base_path());
// $zip->close();
// }
nlog('Finished extracting files');
unlink($file);

13
app/Services/Recurring/CreateRecurringInvitations.php
View File

@ -63,6 +63,19 @@ class CreateRecurringInvitations extends AbstractService
info($e->getMessage());
}
if ($this->entity->invitations()->count() == 0) {
$invitation = $this->invitation_class::where('company_id', $this->entity->company_id)
->where($this->entity_id_name, $this->entity->id)
->withTrashed()
->first();
if ($invitation)
$invitation->restore();
}
return $this->entity;
}
}

2
app/Utils/SystemHealth.php
View File

@ -67,9 +67,9 @@ class SystemHealth
'current_php_version' => phpversion(),
'current_php_cli_version' => (string) self::checkPhpCli(),
'is_okay' => version_compare(phpversion(), self::$php_version, '>='),
'memory_limit' => ini_get('memory_limit'),
],
'env_writable' => self::checkEnvWritable(),
//'mail' => self::testMailServer(),
'simple_db_check' => self::simpleDbCheck(),
'cache_enabled' => self::checkConfigCache(),
'phantom_enabled' => (bool) config('ninja.phantomjs_pdf_generation'),