Fix for all modules using YiiModule etc aliases

avatar/AvatarModule.php

@@ -1,11 +1,12 @@
-<?
+<?php
 Yii::setPathOfAlias('AvatarModule' , dirname(__FILE__));
+Yii::setPathOfAlias('YumModulesRoot' , dirname(dirname(__FILE__)));
 
 class AvatarModule extends CWebModule {
 	public $defaultController = 'avatar';
 
 	// override this with your custom layout, if available
-	public $layout = 'application.modules.user.views.layouts.yum';
+	public $layout = 'YumModulesRoot.user.views.layouts.yum';
 
 	public $avatarPath = 'images';
 
@@ -23,10 +24,10 @@ class AvatarModule extends CWebModule {
 
 	public function init() {
 		$this->setImport(array(
-					'application.modules.user.controllers.*',
-					'application.modules.user.models.*',
-					'application.modules.avatar.controllers.*',
-					'application.modules.avatar.models.*',
+					'YumModulesRoot.user.controllers.*',
+					'YumModulesRoot.user.models.*',
+					'YumModulesRoot.avatar.controllers.*',
+					'YumModulesRoot.avatar.models.*',
 					));
 	}
 

avatar/controllers/YumAvatarController.php

@@ -1,25 +1,25 @@
-<?
+<?php
 
 // This controller handles the upload and the deletion of an Avatar
 // image for the user profile.
 
-Yii::import('application.modules.user.controllers.YumController');
+Yii::import('YumModulesRoot.user.controllers.YumController');
 
 class YumAvatarController extends YumController {
 	public function actionRemoveAvatar() {
 		$model = YumUser::model()->findByPk(Yii::app()->user->id);
 		$model->avatar = '';
 		$model->save();
 		$this->redirect(array(
-					Yum::module('profile')->profileViewRoute));	
+					Yum::module('profile')->profileViewRoute));
 	}
 
 	public function actionEnableGravatar() {
 		$model = YumUser::model()->findByPk(Yii::app()->user->id);
 		$model->avatar = 'gravatar';
 		$model->save();
 		$this->redirect(array(
-					Yum::module('profile')->profileViewRoute));	
+					Yum::module('profile')->profileViewRoute));
 	}
 
 	public function beforeAction($action) {
@@ -53,7 +53,7 @@ public function actionEditAvatar() {
 						Yum::log(Yum::t('User {username} uploaded avatar image {filename}', array(
 										'{username}' => $model->username,
 										'{filename}' => $model->avatar)));
-						$this->redirect(array('//profile/profile/view'));	
+						$this->redirect(array('//profile/profile/view'));
 					}
 				}
 			}

avatar/views/avatar/edit_avatar.php

@@ -1,5 +1,5 @@
 <div class="form">
-<?
+<?php
 $this->title = Yum::t('Upload avatar');
 
 $this->breadcrumbs = array(

friendship/FriendshipModule.php

@@ -1,4 +1,4 @@
-<?
+<?php
 Yii::setPathOfAlias('FriendshipModule' , dirname(__FILE__));
 
 class FriendshipModule extends CWebModule {

friendship/controllers/YumFriendshipController.php

@@ -1,27 +1,27 @@
-<?
-Yii::import('application.modules.user.controllers.YumController');
-Yii::import('application.modules.user.components.*');
-Yii::import('application.modules.user.models.*');
-Yii::import('application.modules.friendship.models.*');
+<?php
+Yii::import('YumModulesRoot.user.controllers.YumController');
+Yii::import('YumComponents.*');
+Yii::import('YumModulesRoot.user.models.*');
+Yii::import('YumModulesRoot.friendship.models.*');
 
 class YumFriendshipController extends YumController {
 	// make sure that friendship is enabled in the configuration
 	public function beforeAction($action) {
-		if(!Yum::hasModule('friendship')) 
+		if(!Yum::hasModule('friendship'))
 			return false;
 		return(parent::beforeAction($action));
 	}
 
 	public function actionIndex() {
-		if(isset($_POST['YumFriendship']['inviter_id']) 
+		if(isset($_POST['YumFriendship']['inviter_id'])
 				&& isset($_POST['YumFriendship']['friend_id']) ) {
 			$friendship = YumFriendship::model()->find(
 					'inviter_id = :inviter_id and friend_id = :friend_id', array(
 						':inviter_id' => $_POST['YumFriendship']['inviter_id'],
 						':friend_id' => $_POST['YumFriendship']['friend_id']));
 
 			if(isset($friendship))
-				if($friendship->inviter_id == Yii::app()->user->id 
+				if($friendship->inviter_id == Yii::app()->user->id
 						|| $friendship->friend_id == Yii::app()->user->id)
 					if(isset($_POST['YumFriendship']['add_request']))
 					{
@@ -32,7 +32,7 @@ public function actionIndex() {
 					} elseif(isset($_POST['YumFriendship']['ignore_request'])) {
 						$friendship->status = 0;
 						$friendship->save();
-					} elseif(isset($_POST['YumFriendship']['cancel_request']) 
+					} elseif(isset($_POST['YumFriendship']['cancel_request'])
 							|| isset($_POST['YumFriendship']['remove_friend'])) {
 						$friendship->delete();
 					}
@@ -54,7 +54,7 @@ public function actionAdmin() {
 
 		$this->render('admin', array('friendships' => $friendships));
 
-	} 
+	}
 
 	public function actionInvite($user_id = null) {
 		if(isset($_POST['user_id']))
@@ -71,7 +71,7 @@ public function actionInvite($user_id = null) {
 				Yum::setFlash('The friendship request has been sent');
 				$this->redirect(array('//profile/profile/view', 'id' => $user_id));
 			}
-		} 
+		}
 
 		$this->render('invitation', array(
 					'inviter' => YumUser::model()->findByPk(Yii::app()->user->id),
@@ -149,7 +149,7 @@ public static function invitationLink($inviter, $invited) {
 
 		$friends = $inviter->getFriends(true);
 		if($friends && $friends[0] != NULL)
-			foreach($friends as $friend) 
+			foreach($friends as $friend)
 				if($friend->id == $invited->id)
 					return false; // already friends, rejected or request pending
 

friendship/models/YumFriendship.php

@@ -1,7 +1,7 @@
-<?
+<?php
 
 class YumFriendship extends YumActiveRecord {
-	const FRIENDSHIP_NONE = 0; 
+	const FRIENDSHIP_NONE = 0;
 	const FRIENDSHIP_REQUEST = 1;
 	const FRIENDSHIP_ACCEPTED = 2;
 	const FRIENDSHIP_REJECTED = 3;
@@ -44,7 +44,7 @@ public function requestFriendship($inviter, $invited, $message = null) {
 			$this->message = $message;
 		$this->status = 1;
 		return $this->save();
-	} 
+	}
 
 	// How many friendship requests have been made in month $month of year $year?
 	public static function countRequest($month = null, $year = null) {
@@ -64,19 +64,19 @@ public static function countRequest($month = null, $year = null) {
 	public function acceptFriendship() {
 		$this->acknowledgetime = time();
 		$this->status = 2;
-		if(Yum::hasModule('message') 
-				&& isset($this->inviter->privacy) 
+		if(Yum::hasModule('message')
+				&& isset($this->inviter->privacy)
 				&& $this->inviter->privacy->message_new_friendship) {
-			Yii::import('application.modules.message.models.YumMessage');
+			Yii::import('YumModulesRoot.message.models.YumMessage');
 			YumMessage::write($this->inviter, $this->invited,
 					Yum::t('Your friendship request has been accepted'),
 					strtr(
 						'Your friendship request to {username} has been accepted', array(
-							'{username}' => $this->inviter->username))); 
+							'{username}' => $this->inviter->username)));
 		}
 		$this->save(false, array('acknowledgetime', 'status'));
 
-	} 
+	}
 
 	public function getFriend() {
 		if($this->friend_id == Yii::app()->user->id)
@@ -103,13 +103,13 @@ public function rejectFriendship() {
 		$this->acknowledgetime = time();
 		$this->status = 3;
 		return($this->save());
-	} 
+	}
 
 	public function ignoreFriendship() {
 		$this->acknowledgetime = time();
 		$this->status = 0;
 		return($this->save());
-	} 
+	}
 
 	public function tableName()
 	{
@@ -156,9 +156,9 @@ public function beforeSave() {
 		if($this->isNewRecord)
 			if($user = YumUser::model()->findByPk($this->friend_id))  {
 				if(Yum::hasModule('message')
-						&& $user->privacy 
+						&& $user->privacy
 						&& $user->privacy->message_new_friendship) {
-					Yii::import('application.modules.message.models.YumMessage');
+					Yii::import('YumModulesRoot.message.models.YumMessage');
 					YumMessage::write($user, $this->inviter,
 							Yum::t('New friendship request from {username}', array(
 									'{username}' => $this->inviter->username)),
@@ -199,7 +199,7 @@ public static function areFriends($uid1, $uid2) {
 			$friendship = YumFriendship::model()->find('status = 2 and inviter_id = '.$uid2 . ' and friend_id = '.$uid1);
 			if($friendship)
 				return true;
-		} 
+		}
 		return false;
 
 	}

friendship/views/friendship/_form.php

@@ -1,51 +1,51 @@
 <div class="form">
 
-<? $form=$this->beginWidget('CActiveForm', array(
+<?php $form=$this->beginWidget('CActiveForm', array(
 	'id'=>'groups-form',
 	'enableAjaxValidation'=>false,
 )); ?>
 
 
 
-	<? echo $form->errorSummary($model); ?>
+	<?php echo $form->errorSummary($model); ?>
 
 	<div class="row">
-	<? echo $form->label($model,'inviter_id'); ?>
-	<? echo $form->textField($model->inviter,'username',array(
+	<?php echo $form->label($model,'inviter_id'); ?>
+	<?php echo $form->textField($model->inviter,'username',array(
 				'size'=>20,'maxlength'=>25,'readonly'=>'readonly')); ?>
-		<? echo $form->error($model,'inviter_id'); ?>
+		<?php echo $form->error($model,'inviter_id'); ?>
 	</div>
 
 	<div class="row">
-		<? echo $form->label($model,'status'); ?>
-		<? 
+		<?php echo $form->label($model,'status'); ?>
+		<?php
 		echo CHtml::activeDropDownList($model,
 		'status',array('0'=>'No friendship requested','1'=>'Confirmation pending','2'=>'Friendship confirmed','3'=>'Friendship rejected'));
 		?>
-		<? echo $form->error($model,'status'); ?>
+		<?php echo $form->error($model,'status'); ?>
 	</div>
 
 
 
 	<div class="row">
-		<? echo $form->label($model,'friend_id'); ?>
-		<? echo $form->textField($model->invited,'username',array(
+		<?php echo $form->label($model,'friend_id'); ?>
+		<?php echo $form->textField($model->invited,'username',array(
 					'size'=>20,'maxlength'=>25,'readonly'=>'readonly')); ?>
-		<? echo $form->error($model,'friend_id'); ?>
+		<?php echo $form->error($model,'friend_id'); ?>
 	</div>
 
 			<div class="row">
-		<? echo $form->label($model,'message'); ?>
-		<? echo $form->textArea($model,'message'); ?>
-		<? echo $form->error($model,'message'); ?>
+		<?php echo $form->label($model,'message'); ?>
+		<?php echo $form->textArea($model,'message'); ?>
+		<?php echo $form->error($model,'message'); ?>
 	</div>
-
 
-
+
+
 	<div class="row buttons">
-		<? echo CHtml::submitButton($model->isNewRecord ? Yii::t('App', 'Create') : Yii::t('App', 'Save')); ?>
+		<?php echo CHtml::submitButton($model->isNewRecord ? Yii::t('App', 'Create') : Yii::t('App', 'Save')); ?>
 	</div>
 
-<? $this->endWidget(); ?>
+<?php $this->endWidget(); ?>
 
 </div><!-- form -->

friendship/views/friendship/_view.php

@@ -1,3 +1,3 @@
-<?
+<?php
 	printf('<h2>%s</h2>', $data->invited->username);
 ?>

friendship/views/friendship/admin.php

@@ -1,4 +1,4 @@
-<?
+<?php
 $this->title = Yum::t('Friendship administration');
 $this->breadcrumbs = array('Friends', 'Admin');
 

friendship/views/friendship/friendedit.php

@@ -1,4 +1,4 @@
-<?
+<?php
 $this->title = Yum::t(ucfirst($user->username) .'\'s friends');
 $this->breadcrumbs = array('Friends', $user->username);
 

friendship/views/friendship/friends.php

@@ -1,4 +1,4 @@
-<?
+<?php
 if(!$profile = @$model->profile)
 	return false;
 
@@ -11,19 +11,19 @@
 				?>
 					<div class="friend">
 					<div class="avatar">
-					<?
+					<?php
 					echo $friend->getAvatar(true);
 				?>
 					<div class="username">
-					<? 
+					<?php 
 					echo CHtml::link(ucwords($friend->username),
 							Yii::app()->createUrl('//profile/profile/view',array(
 									'id'=>$friend->id)));
 				?>
 					</div>
 					</div>
 					</div>
-					<?
+					<?php
 			}
 		} else {
 			echo Yum::t('{username} has no friends yet', array(
@@ -32,6 +32,6 @@
 echo '</div><!-- friends -->';
 }
 Yii::import(
-		'application.modules.friendship.controllers.YumFriendshipController');
+		'YumModulesRoot.friendship.controllers.YumFriendshipController');
 echo YumFriendshipController::invitationLink(Yii::app()->user->id, $model->id);
 ?>

friendship/views/friendship/invitation.php

@@ -1,4 +1,4 @@
-<?
+<?php
 $this->title = Yum::t('Request friendship for user {username}', array(
 			'{username}' => $invited->username));
 $this->breadcrumbs = array(

friendship/views/friendship/myfriends.php

@@ -1,4 +1,4 @@
-<?
+<?php
 $this->title = Yum::t('My friends');
 $this->breadcrumbs = array(Yum::t('Friends'));
 

friendship/views/friendship/new_friends.php

@@ -1,4 +1,4 @@
-<? 
+<?php 
 $user = YumUser::model()->findByPk(Yii::app()->user->id);
 
 if($user->friendship_requests) {

friendship/views/friendship/update.php

@@ -1,11 +1,11 @@
-<?
+<?php
 $this->breadcrumbs=array(
 	Yum::t('Friendships')=>array('index'),
 	$model->id=>array('view','id'=>$model->id),
 	'Update',
 );
 ?>
 
-<h1>Update Friendship #<? echo $model->id; ?></h1>
+<h1>Update Friendship #<?php echo $model->id; ?></h1>
 
-<? echo $this->renderPartial('_form', array('model'=>$model)); ?>
+<?php echo $this->renderPartial('_form', array('model'=>$model)); ?>