[pLog-svn] r5532 - in plog/trunk: class/action/admin class/view/admin templates/admin
mark at devel.lifetype.net
mark at devel.lifetype.net
Tue Jun 12 07:19:24 EDT 2007
Author: mark
Date: 2007-06-12 07:19:23 -0400 (Tue, 12 Jun 2007)
New Revision: 5532
Modified:
plog/trunk/class/action/admin/adminaddfriendaction.class.php
plog/trunk/class/action/admin/admindeletefriendaction.class.php
plog/trunk/class/action/admin/admineditfriendaction.class.php
plog/trunk/class/action/admin/admineditfriendsaction.class.php
plog/trunk/class/action/admin/adminnewfriendaction.class.php
plog/trunk/class/action/admin/adminupdatefriendaction.class.php
plog/trunk/class/view/admin/admineditfriendview.class.php
plog/trunk/class/view/admin/adminfriendslistview.class.php
plog/trunk/class/view/admin/adminnewfriendview.class.php
plog/trunk/templates/admin/menus.xml
Log:
1. Replace include_once with lt_include
2. Remove some unused variables.
Modified: plog/trunk/class/action/admin/adminaddfriendaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddfriendaction.class.php 2007-06-12 11:12:44 UTC (rev 5531)
+++ plog/trunk/class/action/admin/adminaddfriendaction.class.php 2007-06-12 11:19:23 UTC (rev 5532)
@@ -4,13 +4,13 @@
* Friend
*/
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminfriendslistview.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminnewfriendview.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/view/admin/adminfriendslistview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewfriendview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
/**
@@ -50,7 +50,7 @@
// if everything went fine, we can now send the confirmation email
// only if the user specified a valid email address
if( $userInfo->getEmail() != "" ) {
- include_once( PLOG_CLASS_PATH."class/mail/emailservice.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/mail/emailservice.class.php" );
// build an email message
$message = new EmailMessage();
@@ -100,7 +100,7 @@
}
// create the object...
- include_once( PLOG_CLASS_PATH."class/dao/friends.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/friends.class.php" );
$friends = new Friends();
$friendGroups = new FriendGroups();
Modified: plog/trunk/class/action/admin/admindeletefriendaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletefriendaction.class.php 2007-06-12 11:12:44 UTC (rev 5531)
+++ plog/trunk/class/action/admin/admindeletefriendaction.class.php 2007-06-12 11:19:23 UTC (rev 5532)
@@ -1,10 +1,10 @@
<?php
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/friends.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminfriendslistview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/friends.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/view/admin/adminfriendslistview.class.php" );
/**
* \ingroup Action
Modified: plog/trunk/class/action/admin/admineditfriendaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admineditfriendaction.class.php 2007-06-12 11:12:44 UTC (rev 5531)
+++ plog/trunk/class/action/admin/admineditfriendaction.class.php 2007-06-12 11:19:23 UTC (rev 5532)
@@ -3,12 +3,12 @@
* Friend
*/
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/admineditfriendview.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminfriendslistview.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/view/admin/admineditfriendview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/view/admin/adminfriendslistview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
/**
* \ingroup Action
Modified: plog/trunk/class/action/admin/admineditfriendsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admineditfriendsaction.class.php 2007-06-12 11:12:44 UTC (rev 5531)
+++ plog/trunk/class/action/admin/admineditfriendsaction.class.php 2007-06-12 11:19:23 UTC (rev 5532)
@@ -2,9 +2,9 @@
/**
* Friend
*/
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminfriendslistview.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/view/admin/adminfriendslistview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
/**
* \ingroup Action
Modified: plog/trunk/class/action/admin/adminnewfriendaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminnewfriendaction.class.php 2007-06-12 11:12:44 UTC (rev 5531)
+++ plog/trunk/class/action/admin/adminnewfriendaction.class.php 2007-06-12 11:19:23 UTC (rev 5532)
@@ -4,8 +4,8 @@
*/
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminnewfriendview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewfriendview.class.php" );
/**
* \ingroup Action
Modified: plog/trunk/class/action/admin/adminupdatefriendaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminupdatefriendaction.class.php 2007-06-12 11:12:44 UTC (rev 5531)
+++ plog/trunk/class/action/admin/adminupdatefriendaction.class.php 2007-06-12 11:19:23 UTC (rev 5532)
@@ -2,14 +2,14 @@
/**
* Friend
*/
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/friends.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/admineditfriendview.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminfriendslistview.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/friends.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/view/admin/admineditfriendview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/view/admin/adminfriendslistview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
/**
* \ingroup Action
Modified: plog/trunk/class/view/admin/admineditfriendview.class.php
===================================================================
--- plog/trunk/class/view/admin/admineditfriendview.class.php 2007-06-12 11:12:44 UTC (rev 5531)
+++ plog/trunk/class/view/admin/admineditfriendview.class.php 2007-06-12 11:19:23 UTC (rev 5532)
@@ -4,8 +4,8 @@
* Friend
*/
- include_once( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
/**
* \ingroup View
@@ -29,7 +29,7 @@
// get all the friend groups
$friendGroups = new FriendGroups();
$groups = $friendGroups->getUserFriendGroups( $this->_userInfo->getId() );
- $this->notifyEvent( EVENT_FRIEND_RELATIONSHIPS_LOADED, Array( "friendgroups" => &$groups ));
+ $this->notifyEvent( EVENT_FRIEND_GROUPS_LOADED, Array( "friendgroups" => &$groups ));
// put the data in the view
$this->setValue( "friendgroups", $groups );
Modified: plog/trunk/class/view/admin/adminfriendslistview.class.php
===================================================================
--- plog/trunk/class/view/admin/adminfriendslistview.class.php 2007-06-12 11:12:44 UTC (rev 5531)
+++ plog/trunk/class/view/admin/adminfriendslistview.class.php 2007-06-12 11:19:23 UTC (rev 5532)
@@ -4,9 +4,9 @@
* Friend
*/
- include_once( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/friends.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/friends.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
/**
* \ingroup View
@@ -72,7 +72,7 @@
$friendGroups = new FriendGroups();
$groups = $friendGroups->getUserFriendGroups( $this->_userInfo->getId() );
- $this->notifyEvent( EVENT_FRIEND_RELATIONSHIPS_LOADED, Array ( "friendgroups" => &$groups ));
+ $this->notifyEvent( EVENT_FRIEND_GROUPS_LOADED, Array ( "friendgroups" => &$groups ));
$this->setValue( "friends", $userFriends );
$this->setValue( "friendgroups", $groups );
Modified: plog/trunk/class/view/admin/adminnewfriendview.class.php
===================================================================
--- plog/trunk/class/view/admin/adminnewfriendview.class.php 2007-06-12 11:12:44 UTC (rev 5531)
+++ plog/trunk/class/view/admin/adminnewfriendview.class.php 2007-06-12 11:19:23 UTC (rev 5532)
@@ -4,8 +4,8 @@
* Friend
*/
- include_once( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
/**
* \ingroup View
@@ -29,7 +29,7 @@
// get all the friend groups
$friendGroups = new FriendGroups();
$groups = $friendGroups->getUserFriendGroups( $this->_userInfo->getId() );
- $this->notifyEvent( EVENT_FRIEND_RELATIONSHIPS_LOADED, Array( "friendgroups" => &$groups ));
+ $this->notifyEvent( EVENT_FRIEND_GROUPS_LOADED, Array( "friendgroups" => &$groups ));
// put the data in the view
$this->setValue( "friendgroups", $groups );
Modified: plog/trunk/templates/admin/menus.xml
===================================================================
--- plog/trunk/templates/admin/menus.xml 2007-06-12 11:12:44 UTC (rev 5531)
+++ plog/trunk/templates/admin/menus.xml 2007-06-12 11:19:23 UTC (rev 5532)
@@ -29,7 +29,7 @@
<friendNetwork url="?op=friendNetwork">
<manageFriends ignoreBreadCrumbs="1">
<newFriend url="?op=newFriend"/>
- <editFriends url="?op=editFriend"/>
+ <editFriends url="?op=editFriends"/>
<newFriendGroup url="?op=newFriendGroup"/>
<editFriendGroups url="?op=editFriendGroups"/>
</manageFriends>
More information about the pLog-svn
mailing list