Merge pull request #6 from s-nakajima/master

アバター処理の追加
NetCommons3 · Nov 20, 2015 · e27c34d · e27c34d
2 parents 8192253 + 1c636d1
commit e27c34d
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 2 deletions.
diff --git a/Controller/Component/PrivateSpaceComponent.php b/Controller/Component/PrivateSpaceComponent.php
@@ -26,13 +26,21 @@ class PrivateSpaceComponent extends Component {
  * @return bool
  */
 	public function accessCheck(Controller $controller) {
+		if ($controller->request->params['action'] === 'download') {
+			return true;
+		}
+
 		if (! Current::read('RolesRoomsUser.user_id') ||
-				Current::read('RolesRoomsUser.user_id') !== Current::read('User.id') ||
-				! Current::read('User.UserRoleSetting.use_private_room')) {
+				Current::read('RolesRoomsUser.user_id') !== Current::read('User.id')) {
 
 			return false;
 		}
 
+		if ($controller->request->params['plugin'] !== Current::PLUGIN_USERS &&
+				! Current::read('User.UserRoleSetting.use_private_room')) {
+			return false;
+		}
+
 		if (! $controller->Session->check('roomAccesse.' . Current::read('RolesRoomsUser.id'))) {
 			$RolesRoomsUser = ClassRegistry::init('Rooms.RolesRoomsUser');
 			$RolesRoomsUser->saveAccessed(Current::read('RolesRoomsUser.id'));

diff --git a/Model/Behavior/PrivateSpaceBehavior.php b/Model/Behavior/PrivateSpaceBehavior.php
@@ -19,4 +19,56 @@
  */
 class PrivateSpaceBehavior extends ModelBehavior {
 
+/**
+ * Setup this behavior with the specified configuration settings.
+ *
+ * @param Model $model Model using this behavior
+ * @param array $config Configuration settings for $model
+ * @return void
+ */
+	public function setup(Model $model, $config = array()) {
+		parent::setup($model, $config);
+
+		$model->loadModels([
+			'RolesRoomsUser' => 'Rooms.RolesRoomsUser',
+			'Room' => 'Rooms.Room',
+			'Space' => 'Rooms.Space',
+		]);
+	}
+
+/**
+ * ルームデータ取得
+ *
+ * @param Model $model ビヘイビア呼び出し元モデル
+ * @param int $userId ユーザID
+ * @return array ルームデータ
+ */
+	public function getPrivateRoomByUserId(Model $model, $userId) {
+		$result = $model->Room->find('first', array(
+			'recursive' => -1,
+			'fields' => array(
+				$model->Room->alias . '.*',
+				$model->RolesRoomsUser->alias . '.*',
+			),
+			'conditions' => array(
+				$model->Room->alias . '.space_id' => Space::PRIVATE_SPACE_ID,
+				$model->Room->alias . '.page_id_top NOT' => null,
+				//$model->Room->alias . '.root_id' => $rootIds,
+			),
+			'joins' => array(
+				array(
+					'table' => $model->RolesRoomsUser->table,
+					'alias' => $model->RolesRoomsUser->alias,
+					'type' => 'INNER',
+					'conditions' => array(
+						$model->RolesRoomsUser->alias . '.room_id' . ' = ' . $model->Room->alias . ' .id',
+						$model->RolesRoomsUser->alias . '.user_id' => $userId,
+					),
+				),
+			),
+		));
+
+		return $result;
+	}
+
 }