Merge pull request #7717 from turbo124/v5-stable

Code Cleanup

app/Http/Controllers/SelfUpdateController.php

@@ -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);

app/Services/Recurring/CreateRecurringInvitations.php

@@ -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;
     }
 }

app/Utils/SystemHealth.php

@@ -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'),