Jump to content
Froxlor Forum

d00p

Administrators
 View Profile  See their activity

  • Posts

    10613

  • Joined

  • Last visited

  • Days Won

    43

 Content Type 

Posts posted by d00p

    Creating a Customer via API does not create a standard Subdomain

    in Feedback

    Posted

    Weird, I'm not aware of any restrictions for attachments...need to check. In the meatime here: 

    diff --git a/lib/Froxlor/Api/Commands/Customers.php b/lib/Froxlor/Api/Commands/Customers.php
index ccbef644..f0492ed2 100644
--- a/lib/Froxlor/Api/Commands/Customers.php
+++ b/lib/Froxlor/Api/Commands/Customers.php
@@ -738,11 +738,12 @@ class Customers extends ApiCommand implements ResourceEntity
 							'adminid' => $this->getUserDetail('adminid'),
 							'docroot' => $documentroot,
 							'phpenabled' => $phpenabled,
-							'openbasedir' => '1'
+							'openbasedir' => '1',
+							'is_stdsubdomain' => 1
 						];
 						$domainid = -1;
 						try {
-							$std_domain = $this->apiCall('Domains.add', $ins_data);
+							$std_domain = $this->apiCall('Domains.add', $ins_data, true);
 							$domainid = $std_domain['id'];
 						} catch (Exception $e) {
 							$this->logger()->logAction(FroxlorLogger::ADM_ACTION, LOG_ERR, "[API] Unable to add standard-subdomain: " . $e->getMessage());
diff --git a/lib/Froxlor/Api/Commands/Domains.php b/lib/Froxlor/Api/Commands/Domains.php
index 2dfbfb94..0ed0fbc9 100644
--- a/lib/Froxlor/Api/Commands/Domains.php
+++ b/lib/Froxlor/Api/Commands/Domains.php
@@ -274,7 +274,8 @@ class Domains extends ApiCommand implements ResourceEntity
 	 *            $override_tls is true
 	 * @param string $description
 	 *            optional custom description (currently not used/shown in the frontend), default empty
-	 *
+	 * @param bool $is_stdsubdomain (internally)
+	 *            optional whether this is a standard subdomain for a customer which is being added so no usage is decreased
 	 * @access admin
 	 * @return string json-encoded array
 	 * @throws Exception
@@ -282,7 +283,8 @@ class Domains extends ApiCommand implements ResourceEntity
 	public function add()
 	{
 		if ($this->isAdmin()) {
-			if ($this->getUserDetail('domains_used') < $this->getUserDetail('domains') || $this->getUserDetail('domains') == '-1') {
+			$is_stdsubdomain = $this->isInternal() ? $this->getBoolParam('is_stdsubdomain', true, 0) : false;
+			if ($is_stdsubdomain || $this->getUserDetail('domains_used') < $this->getUserDetail('domains') || $this->getUserDetail('domains') == '-1') {
 				// parameters
 				$p_domain = $this->getParam('domain');

@@ -795,12 +797,15 @@ class Domains extends ApiCommand implements ResourceEntity
 					$ins_data['id'] = $domainid;
 					unset($ins_data);

-					$upd_stmt = Database::prepare("
-						UPDATE `" . TABLE_PANEL_ADMINS . "` SET `domains_used` = `domains_used` + 1
-						WHERE `adminid` = :adminid");
-					Database::pexecute($upd_stmt, [
-						'adminid' => $adminid
-					], true, true);
+					if (!$is_stdsubdomain) {
+						$upd_stmt = Database::prepare("
+							UPDATE `" . TABLE_PANEL_ADMINS . "` SET `domains_used` = `domains_used` + 1
+							WHERE `adminid` = :adminid
+						");
+						Database::pexecute($upd_stmt, [
+							'adminid' => $adminid
+						], true, true);
+					}

 					$ins_stmt = Database::prepare("
 						INSERT INTO `" . TABLE_DOMAINTOIP . "` SET

     

    Update 2.2: In ConfigParser.php line 106: File not readable

    in German / Deutsch

    Posted

    die build.xml hat absolut nix damit zu tun.

    Pflege mal folgende Änderungen ein und dann versuchen wir das ganze einzugrenzen:
      

    diff --git a/lib/Froxlor/Config/ConfigParser.php b/lib/Froxlor/Config/ConfigParser.php
index 874b1053..ded1694a 100644
--- a/lib/Froxlor/Config/ConfigParser.php
+++ b/lib/Froxlor/Config/ConfigParser.php
@@ -103,7 +103,7 @@ class ConfigParser
        public function __construct($filename)
        {
                if (!is_readable($filename)) {
-                       throw new Exception('File not readable');
+                       throw new Exception('File not readable ('.$filename.')');
                }
 
                $this->xml = simplexml_load_file($filename);

    Dann wissen wir genau,welche Datei er da lesen will und nicht kann

    Froxlor 2.2 php.ini ignoriert mysqli.allow_local_infile = On

    in General Discussion

    Posted

    Das hast du falsch verstanden, du sollst da nicht fix den wert reinschreiben in die System-Einstellungen, sondern lediglich in welchem scope (php_flag, php_value, php_admin_flag oder php_admin_value) die setting 'mysqli.allow_local_infile' zuzuordnen ist. Ob und mit welchem Wert du die dann in welche PHP-Konfiguration einträgst bleibt dir überlassen, es geht nur darum, dass froxlor die ini Anweisung KENNT damit sie diese aus der PHP-Konfiguration in die pool-config von php-fpm schreiben kann.

    Update auf 2.2.x

    in German / Deutsch

    Posted

    Just now, Anachon said:

    Mahlzeit!

    Das bedeutet, es ist irrelevant, wenn man mit opendkim was laufen hat, aber nichts mit dkim in Froxlor gemacht hat?

     

    vG

    Solange du keine Datenbankfelder aus der Froxlor-Anwendung verwendest - ja

×
×
  • Create New...