[pLog-svn] r2795 - in plog/trunk: class/action/admin class/dao templates/admin

mark at devel.lifetype.net mark at devel.lifetype.net
Mon Jan 16 08:10:07 GMT 2006


Author: mark
Date: 2006-01-16 08:10:06 +0000 (Mon, 16 Jan 2006)
New Revision: 2795

Modified:
   plog/trunk/class/action/admin/adminaddbloguseraction.class.php
   plog/trunk/class/dao/userpermissions.class.php
   plog/trunk/templates/admin/blogtemplates.template
   plog/trunk/templates/admin/blogusers.template
Log:
1. More codes and templates clean up
2. addbloguser and deletebloguserpermission works again

Modified: plog/trunk/class/action/admin/adminaddbloguseraction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddbloguseraction.class.php	2006-01-16 07:40:28 UTC (rev 2794)
+++ plog/trunk/class/action/admin/adminaddbloguseraction.class.php	2006-01-16 08:10:06 UTC (rev 2795)
@@ -4,6 +4,7 @@
     include_once( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
     include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
     include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
+    include_once( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
     include_once( PLOG_CLASS_PATH."class/view/admin/adminbloguserslistview.class.php" );
     include_once( PLOG_CLASS_PATH."class/mail/emailservice.class.php" );
 

Modified: plog/trunk/class/dao/userpermissions.class.php
===================================================================
--- plog/trunk/class/dao/userpermissions.class.php	2006-01-16 07:40:28 UTC (rev 2794)
+++ plog/trunk/class/dao/userpermissions.class.php	2006-01-16 08:10:06 UTC (rev 2795)
@@ -109,7 +109,7 @@
 			$userPerms = $this->getUserPermissions( $userId, $blogId );
 			foreach( $userPerms as $perm ) {
 				if( $perm->getUserId() == $userId && $perm->getBlogId() == $blogId && 
-				    $perm->getPermissionId() == $permissionId()) {
+				    $perm->getPermissionId() == $permissionId ) {
 					$found = true;
 					break;
 				}
@@ -118,7 +118,7 @@
 				return( true );
 
 			// build the query to remove the row
-			$query = "DELETE FROM ".$this->getPrefix()."user_permissions WHERE user_id = '".Db::qstr( $userId )."'
+			$query = "DELETE FROM ".$this->getPrefix()."users_permissions WHERE user_id = '".Db::qstr( $userId )."'
 			          AND blog_id = '".Db::qstr( $blogId ) ."' AND permission_id = '".Db::qstr( $permissionId )."'";
 			// and execute it
 			$result = $this->Execute( $query );

Modified: plog/trunk/templates/admin/blogtemplates.template
===================================================================
--- plog/trunk/templates/admin/blogtemplates.template	2006-01-16 07:40:28 UTC (rev 2794)
+++ plog/trunk/templates/admin/blogtemplates.template	2006-01-16 08:10:06 UTC (rev 2795)
@@ -8,7 +8,7 @@
   <table class="info">
    <thead>
     <tr>
-      <th style="width:10px;"><input class="checkbox" type="checkbox" class="check" name="all" id="all" value="1" onclick="toggleAllChecks('editTemplates');" /></th>
+      <th style="width:10px;"><input class="checkbox" type="checkbox" name="all" id="all" value="1" onclick="toggleAllChecks('editTemplates');" /></th>
       <th style="width:670px;">{$locale->tr("template")}</th>
       <th style="width:95px;">{$locale->tr("actions")}</th>
     </tr>
@@ -53,4 +53,5 @@
    <input type="submit" name="{$locale->tr("delete")}" value="{$locale->tr("delete")}"/>
  </div>
  </form>
+{include file="$admintemplatepath/footernavigation.template"}
 {include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/admin/blogusers.template
===================================================================
--- plog/trunk/templates/admin/blogusers.template	2006-01-16 07:40:28 UTC (rev 2794)
+++ plog/trunk/templates/admin/blogusers.template	2006-01-16 08:10:06 UTC (rev 2795)
@@ -8,7 +8,7 @@
             <table class="info">
                 <thead>
                     <tr>
-                        <th style="width:10px;"><input class="checkbox" type="checkbox" class="check" name="all" id="all" value="1" onclick="toggleAllChecks('blogUsers');" /></th>
+                        <th style="width:10px;"><input class="checkbox" type="checkbox" name="all" id="all" value="1" onclick="toggleAllChecks('blogUsers');" /></th>
                         <th style="width:145px;">{$locale->tr("username")}</th>
                         <th style="width:325px;">{$locale->tr("full_name")}</th>                        
                         <th style="width:210px;">{$locale->tr("email")}</th>



More information about the pLog-svn mailing list