エクスポートにシステム管理者も含まれてしまう。

NetCommons3/NetCommons3#427
NetCommons3 · Aug 19, 2016 · 83cfed6 · 83cfed6
1 parent 838d507
commit 83cfed6
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Controller/UserManagerController.php b/Controller/UserManagerController.php
@@ -322,6 +322,9 @@ public function download_import_format() {
  * @return void
  */
 	public function export() {
+		//タイムアウトはっせいするなら適宜設定
+		set_time_limit(1800);
+
 		$this->helpers[] = 'Users.UserSearchForm';
 		$this->helpers[] = 'Users.UserSearch';
 
@@ -332,7 +335,10 @@ public function export() {
 				array(
 					'conditions' => array(
 						'space_id' => Space::PRIVATE_SPACE_ID,
-						'User.role_key !=' => UserRole::USER_ROLE_KEY_SYSTEM_ADMINISTRATOR,
+						'User.role_key NOT' => array(
+							UserRole::USER_ROLE_KEY_SYSTEM_ADMINISTRATOR,
+							UserRole::USER_ROLE_KEY_ADMINISTRATOR
+						),
 						'User.is_deleted' => false,
 					),
 					'joins' => array('Room' => array(