Remember user who created a site. (#13362)

* Remember user who created a site.

* Bump version & change column name to creator_login.

* Rename Site::getCreationUserFor

* Process sites like other methods in getPatternMatchSites().

* Update expected test files.

* update test again

4 files changed, 53 insertions, 0 deletions

diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index 7abf627c75..a6256d7ab5 100644
--- a/plugins/SitesManager/API.php
+++ b/plugins/SitesManager/API.php
@@ -547,6 +547,11 @@ class API extends \Piwik\Plugin\API
         $name = Piwik::translate($key);
 
         $site['currency_name'] = ($key === $name) ? $site['currency'] : $name;
+
+        // don't want to expose other user logins here
+        if (!Piwik::hasUserSuperUserAccess()) {
+            unset($site['creator_login']);
+        }
     }
 
     /**
@@ -648,6 +653,8 @@ class API extends \Piwik\Plugin\API
             $bind['group'] = "";
         }
 
+        $bind['creator_login'] = Piwik::getCurrentUserLogin();
+
         $allSettings = $this->setAndValidateMeasurableSettings(0, 'website', $coreProperties);
 
         // any setting specified in setting values will overwrite other setting
@@ -1622,7 +1629,12 @@ class API extends \Piwik\Plugin\API
 
         $sites = $this->getModel()->getPatternMatchSites($ids, $pattern, $limit);
 
+        foreach ($sites as &$site) {
+            $this->enrichSite($site);
+        }
+
         $sites = Site::setSitesFromArray($sites);
+
         return $sites;
     }
 
diff --git a/plugins/SitesManager/tests/Integration/ApiTest.php b/plugins/SitesManager/tests/Integration/ApiTest.php
index 3bc477fcf3..c5ac79167c 100644
--- a/plugins/SitesManager/tests/Integration/ApiTest.php
+++ b/plugins/SitesManager/tests/Integration/ApiTest.php
@@ -124,6 +124,8 @@ class ApiTest extends IntegrationTestCase
         $this->assertTrue(Site::isSiteSearchEnabledFor($idsite));
         $this->assertEquals($expectedWebsiteType, $siteInfo['type']);
         $this->assertEquals($expectedWebsiteType, Site::getTypeFor($idsite));
+        $this->assertEquals('superUserLogin', $siteInfo['creator_login']);
+        $this->assertEquals('superUserLogin', Site::getCreatorLoginFor($idsite));
 
         $this->assertEquals($searchKeywordParameters, $siteInfo['sitesearch_keyword_parameters']);
         $this->assertEquals($searchCategoryParameters, $siteInfo['sitesearch_category_parameters']);
diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getPatternMatchSites.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getPatternMatchSites.xml
index baea44a4a8..40a0823b76 100644
--- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getPatternMatchSites.xml
+++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getPatternMatchSites.xml
@@ -18,6 +18,9 @@
 		<group />
 		<type>website</type>
 		<keep_url_fragment>0</keep_url_fragment>
+		<creator_login>superUserLogin</creator_login>
+		<timezone_name>UTC</timezone_name>
+		<currency_name>US Dollar</currency_name>
 	</row>
 	<row>
 		<idsite>10</idsite>
@@ -37,6 +40,9 @@
 		<group />
 		<type>website</type>
 		<keep_url_fragment>0</keep_url_fragment>
+		<creator_login>superUserLogin</creator_login>
+		<timezone_name>UTC</timezone_name>
+		<currency_name>US Dollar</currency_name>
 	</row>
 	<row>
 		<idsite>11</idsite>
@@ -56,6 +62,9 @@
 		<group />
 		<type>website</type>
 		<keep_url_fragment>0</keep_url_fragment>
+		<creator_login>superUserLogin</creator_login>
+		<timezone_name>UTC</timezone_name>
+		<currency_name>US Dollar</currency_name>
 	</row>
 	<row>
 		<idsite>12</idsite>
@@ -75,6 +84,9 @@
 		<group />
 		<type>website</type>
 		<keep_url_fragment>0</keep_url_fragment>
+		<creator_login>superUserLogin</creator_login>
+		<timezone_name>UTC</timezone_name>
+		<currency_name>US Dollar</currency_name>
 	</row>
 	<row>
 		<idsite>13</idsite>
@@ -94,6 +106,9 @@
 		<group />
 		<type>website</type>
 		<keep_url_fragment>0</keep_url_fragment>
+		<creator_login>superUserLogin</creator_login>
+		<timezone_name>UTC</timezone_name>
+		<currency_name>US Dollar</currency_name>
 	</row>
 	<row>
 		<idsite>14</idsite>
@@ -113,6 +128,9 @@
 		<group />
 		<type>website</type>
 		<keep_url_fragment>0</keep_url_fragment>
+		<creator_login>superUserLogin</creator_login>
+		<timezone_name>UTC</timezone_name>
+		<currency_name>US Dollar</currency_name>
 	</row>
 	<row>
 		<idsite>15</idsite>
@@ -132,6 +150,9 @@
 		<group />
 		<type>website</type>
 		<keep_url_fragment>0</keep_url_fragment>
+		<creator_login>superUserLogin</creator_login>
+		<timezone_name>UTC</timezone_name>
+		<currency_name>US Dollar</currency_name>
 	</row>
 	<row>
 		<idsite>16</idsite>
@@ -151,6 +172,9 @@
 		<group />
 		<type>website</type>
 		<keep_url_fragment>0</keep_url_fragment>
+		<creator_login>superUserLogin</creator_login>
+		<timezone_name>UTC</timezone_name>
+		<currency_name>US Dollar</currency_name>
 	</row>
 	<row>
 		<idsite>17</idsite>
@@ -170,6 +194,9 @@
 		<group />
 		<type>website</type>
 		<keep_url_fragment>0</keep_url_fragment>
+		<creator_login>superUserLogin</creator_login>
+		<timezone_name>UTC</timezone_name>
+		<currency_name>US Dollar</currency_name>
 	</row>
 	<row>
 		<idsite>18</idsite>
@@ -189,6 +216,9 @@
 		<group />
 		<type>website</type>
 		<keep_url_fragment>0</keep_url_fragment>
+		<creator_login>superUserLogin</creator_login>
+		<timezone_name>UTC</timezone_name>
+		<currency_name>US Dollar</currency_name>
 	</row>
 	<row>
 		<idsite>19</idsite>
@@ -208,5 +238,8 @@
 		<group />
 		<type>website</type>
 		<keep_url_fragment>0</keep_url_fragment>
+		<creator_login>superUserLogin</creator_login>
+		<timezone_name>UTC</timezone_name>
+		<currency_name>US Dollar</currency_name>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManagerwithLimit__SitesManager.getPatternMatchSites.xml b/plugins/SitesManager/tests/System/expected/test_SitesManagerwithLimit__SitesManager.getPatternMatchSites.xml
index 31601184b7..ff12b972da 100644
--- a/plugins/SitesManager/tests/System/expected/test_SitesManagerwithLimit__SitesManager.getPatternMatchSites.xml
+++ b/plugins/SitesManager/tests/System/expected/test_SitesManagerwithLimit__SitesManager.getPatternMatchSites.xml
@@ -18,6 +18,9 @@
 		<group />
 		<type>website</type>
 		<keep_url_fragment>0</keep_url_fragment>
+		<creator_login>superUserLogin</creator_login>
+		<timezone_name>UTC</timezone_name>
+		<currency_name>US Dollar</currency_name>
 	</row>
 	<row>
 		<idsite>10</idsite>
@@ -37,5 +40,8 @@
 		<group />
 		<type>website</type>
 		<keep_url_fragment>0</keep_url_fragment>
+		<creator_login>superUserLogin</creator_login>
+		<timezone_name>UTC</timezone_name>
+		<currency_name>US Dollar</currency_name>
 	</row>
 </result>
\ No newline at end of file