Fixed issues in extension installer.

Author: tbrehm

interface/web/admin/extension_edit.php

@@ -118,7 +118,7 @@
 		// if license has changed
 		if($extension['license'] != $_POST['license']) {
 			// check license with regex
-			if(!preg_match('/^[a-zA-Z0-9\-]+$/', $_POST['license'])) {
+			if(!empty($_POST['license']) && !preg_match('/^[a-zA-Z0-9\-]+$/', $_POST['license'])) {
 				show_message('invalid_license_txt', 'admin/extension_repo_list.php');
 				$success = false;
 			}

interface/web/admin/lib/lang/en_extension_install_list.lng

@@ -47,4 +47,5 @@ $wb['license_txt'] = 'License key';
 $wb['repo_version_txt'] = 'Repository Version';
 $wb['update_extension_txt'] = 'Update Extension';
 $wb['btn_save_txt'] = 'Save';
+$wb['invalid_license_txt'] = 'Invalid license key';
 ?>

server/lib/classes/extension_installer.inc.php

@@ -936,13 +936,13 @@ public function updateLicense($name, $server_id, $license) {
 		global $app;
 
 		// check name with regex
-		if (!preg_match('/^[a-z0-9_]+$/', $name)) {
+		if (!preg_match('/^[a-zA-Z0-9\-]+$/', $name)) {
 			$this->addError('Invalid extension name.');
 			return false;
 		}
 
 		// check license
-		if (!preg_match('/^[a-zA-Z0-9\-]+$/', $license)) {
+		if (!empty($license) && !preg_match('/^[a-zA-Z0-9\-]+$/', $license)) {
 			$this->addError('Invalid license.');
 			return false;
 		}
@@ -978,7 +978,7 @@ public function getLicense($name, $server_id) {
 		global $app;
 
 		// check name with regex
-		if (!preg_match('/^[a-z0-9_]+$/', $name)) {
+		if (!preg_match('/^[a-zA-Z0-9\-]+$/', $name)) {
 			$this->addError('Invalid extension name.');
 			return false;
 		}
@@ -1011,7 +1011,7 @@ public function deleteLicense($name, $server_id) {
 		global $app;
 
 		// check name with regex
-		if (!preg_match('/^[a-z0-9_]+$/', $name)) {
+		if (!preg_match('/^[a-zA-Z0-9\-]+$/', $name)) {
 			$this->addError('Invalid extension name.');
 			return false;
 		}

server/plugins-available/extension_plugin.inc.php

@@ -113,7 +113,7 @@ public function extension_action($action_name, $data) {
             foreach($app->extension_installer->getErrors() as $error) {
                 $error_txt .= $error . "\n";
             }
-            $app->log('Extension installer error: ' . $error_txt, LOGLEVEL_WARNING);
+            $app->log('Extension installer error: ' . $error_txt, LOGLEVEL_WARN);
             return 'error';
         }