diff --git a/phpmon/Classes/Commands/Actions.swift b/phpmon/Classes/Commands/Actions.swift index 1ac67dc..a181229 100644 --- a/phpmon/Classes/Commands/Actions.swift +++ b/phpmon/Classes/Commands/Actions.swift @@ -99,41 +99,6 @@ class Actions { NSWorkspace.shared.activateFileViewerSelecting(files as [URL]) } - // MARK: - Xdebug Actions - - public static func didFindXdebug(_ version: String) -> Bool - { - return grepContains( - file: "\(Paths.etcPath)/php/\(version)/php.ini", - query: "zend_extension=\"xdebug.so\"" - ) - } - - public static func didEnableXdebug(_ version: String) -> Bool - { - return !grepContains( - file: "\(Paths.etcPath)/php/\(version)/php.ini", - query: "; zend_extension=\"xdebug.so\"" - ) - } - - public static func toggleXdebug() - { - let version = App.phpInstall!.version.short - - self.didEnableXdebug(version) - ? sed( - file: "\(Paths.etcPath)/php/\(version)/php.ini", - original: "zend_extension=\"xdebug.so\"", - replacement: "; zend_extension=\"xdebug.so\"" - ) - : sed( - file: "\(Paths.etcPath)/php/\(version)/php.ini", - original: "; zend_extension=\"xdebug.so\"", - replacement: "zend_extension=\"xdebug.so\"" - ) - } - // MARK: - Quick Fix /** diff --git a/phpmon/Classes/Core/PhpInstall.swift b/phpmon/Classes/Core/PhpInstall.swift index 8ef2ab0..1410954 100644 --- a/phpmon/Classes/Core/PhpInstall.swift +++ b/phpmon/Classes/Core/PhpInstall.swift @@ -42,8 +42,6 @@ class PhpInstall { upload_max_filesize: type(of: self).getIniValue(key: "upload_max_filesize"), post_max_size: type(of: self).getIniValue(key: "post_max_size") ) - - print(self.configuration) } private static func getVersion() -> Version { diff --git a/phpmon/Classes/Menu/StatusMenu.swift b/phpmon/Classes/Menu/StatusMenu.swift index 4fb3e89..5b541dc 100644 --- a/phpmon/Classes/Menu/StatusMenu.swift +++ b/phpmon/Classes/Menu/StatusMenu.swift @@ -96,9 +96,9 @@ class StatusMenu : NSMenu { self.addItem(NSMenuItem.separator()) self.addItem(NSMenuItem(title: "mi_limits".localized, action: nil, keyEquivalent: "")) - self.addItem(NSMenuItem(title: "memory_limit: \(App.phpInstall!.configuration.memory_limit)", action: #selector(MainMenu.openActiveConfigFolder), keyEquivalent: "")) - self.addItem(NSMenuItem(title: "post_max_size: \(App.phpInstall!.configuration.post_max_size)", action: #selector(MainMenu.openActiveConfigFolder), keyEquivalent: "")) - self.addItem(NSMenuItem(title: "upload_max_filesize: \(App.phpInstall!.configuration.upload_max_filesize)", action: #selector(MainMenu.openActiveConfigFolder), keyEquivalent: "")) + self.addItem(NSMenuItem(title: "\("mi_memory_limit".localized): \(App.phpInstall!.configuration.memory_limit)", action: #selector(MainMenu.openActiveConfigFolder), keyEquivalent: "")) + self.addItem(NSMenuItem(title: "\("mi_post_max_size".localized): \(App.phpInstall!.configuration.post_max_size)", action: #selector(MainMenu.openActiveConfigFolder), keyEquivalent: "")) + self.addItem(NSMenuItem(title: "\("mi_upload_max_filesize".localized): \(App.phpInstall!.configuration.upload_max_filesize)", action: #selector(MainMenu.openActiveConfigFolder), keyEquivalent: "")) // Extensions diff --git a/phpmon/Localizable.strings b/phpmon/Localizable.strings index d3de26a..93ed224 100644 --- a/phpmon/Localizable.strings +++ b/phpmon/Localizable.strings @@ -28,6 +28,10 @@ "mi_configuration" = "Configuration"; "mi_limits" = "Memory & Upload Limits"; +"mi_memory_limit" = "Script Memory Limit"; +"mi_post_max_size" = "Max POST Size"; +"mi_upload_max_filesize" = "Max Upload File Size"; + "mi_valet_config" = "Locate Valet folder (.config/valet)"; "mi_php_config" = "Locate PHP configuration file (php.ini)"; "mi_phpinfo" = "Show current configuration (phpinfo)"; diff --git a/phpmon/Singletons/MainMenu.swift b/phpmon/Singletons/MainMenu.swift index 93d6b89..cbae2dc 100644 --- a/phpmon/Singletons/MainMenu.swift +++ b/phpmon/Singletons/MainMenu.swift @@ -204,12 +204,6 @@ class MainMenu: NSObject, NSWindowDelegate { }) } - @objc public func toggleXdebug() { - self.waitAndExecute({ - Actions.toggleXdebug() - }) - } - @objc public func toggleExtension(sender: ExtensionMenuItem) { self.waitAndExecute({ // Toggle that extension