[pLog-svn] r562 - in plog/trunk: class/action/admin class/view/admin templates/admin

oscar at devel.plogworld.net oscar at devel.plogworld.net
Wed Dec 22 15:14:02 GMT 2004


Author: oscar
Date: 2004-12-22 15:14:01 +0000 (Wed, 22 Dec 2004)
New Revision: 562

Modified:
   plog/trunk/class/action/admin/adminresourcesaction.class.php
   plog/trunk/class/view/admin/adminresourceslistview.class.php
   plog/trunk/templates/admin/menus.xml
   plog/trunk/templates/admin/resources.template
Log:
removed the "intermediate" screen that users could see when clicking "resource". Now they go straight ahead into the list of resources and the current quota and number of resources appears at the bottom of the page


Modified: plog/trunk/class/action/admin/adminresourcesaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminresourcesaction.class.php	2004-12-22 15:01:30 UTC (rev 561)
+++ plog/trunk/class/action/admin/adminresourcesaction.class.php	2004-12-22 15:14:01 UTC (rev 562)
@@ -8,6 +8,7 @@
 	include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
 	include_once( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
 	include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+	include_once( PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php" );
 
     /**
      * shows all the resources of a blog
@@ -32,16 +33,42 @@
 			$this->setValidationErrorView( $view );
         }
 
+	function checkFolders()
+	{
+		$baseFolder = GalleryResourceStorage::getResourcesStorageFolder();
+		$userFolder = GalleryResourceStorage::getUserFolder( $this->_blogInfo->getId());
+		$previewsFolder = GalleryResourceStorage::getPreviewsFolder( $this->_blogInfo->getId());
+		$folders = "$baseFolder<br/>$userFolder<br/>$previewsFolder";
+
+		$message = "";
+
+		// check if the storage folder exists and it is readable
+		if( !GalleryResourceStorage::checkBaseStorageFolder() || 
+                    !GalleryResourceStorage::checkUserStorageFolder( $this->_blogInfo->getId()) ||
+                    !GalleryResourceStorage::checkPreviewsStorageFolder( $this->_blogInfo->getId())) {
+			$message = $this->_locale->pr("error_base_storage_folder_missing_or_unreadable", $folders);
+		}
+
+		return $message;
+	}
+
         /**
          * Carries out the specified action
          */
         function perform()
         {
-            $this->_albumId = $this->_request->getValue( "albumId" );
-            if( $this->_albumId == "" )
-            	$this->_albumId = 0;		
-		
+            $this->_albumId = $this->_request->getValue( "albumId", 0 );
+
+		$errorMessage = $this->checkFolders();
+		if( $errorMessage ) {
+			// something happened, we leave it here...
+			$this->_view = new AdminErrorView( $this->_blogInfo );
+			$this->_view->setMessage( $errorMessage );
+		}
+		else {
 			$this->_view = new AdminResourcesListView( $this->_blogInfo, Array( "albumId" => $this->_albumId ));
+		}
+
             $this->setCommonData();
 
             return true;

Modified: plog/trunk/class/view/admin/adminresourceslistview.class.php
===================================================================
--- plog/trunk/class/view/admin/adminresourceslistview.class.php	2004-12-22 15:01:30 UTC (rev 561)
+++ plog/trunk/class/view/admin/adminresourceslistview.class.php	2004-12-22 15:14:01 UTC (rev 562)
@@ -3,6 +3,7 @@
 	include_once( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
     include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
     include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );	
+	include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcequotas.class.php" );
 	
 	define( "ROOT_ALBUM_ID", 0 );
 	
@@ -52,6 +53,15 @@
 			$userAlbums = $galleryAlbums->getNestedAlbumList( $this->_blogInfo->getId());
 			$this->setValue( "albumsList", $userAlbums );			
 
+			// etch some statistics and continue
+			$quotaUsage = GalleryResourceQuotas::getBlogResourceQuotaUsage( $this->_blogInfo->getId());
+			$galleryResources = new GalleryResources();
+			$totalResources = $galleryResources->getNumResources( $this->_blogInfo->getId());
+			$currentQuota = GalleryResourceQuotas::getBlogResourceQuota( $this->_blogInfo->getId());
+			$this->setValue( "quotausage", $quotaUsage );
+			$this->setValue( "totalresources", $totalResources );
+			$this->setValue( "quota", $currentQuota );						
+
             $this->setValue( "album", $album );
 			if( $this->_albumId > ROOT_ALBUM_ID )
 				$this->setValue( "albums", $album->getChildren());

Modified: plog/trunk/templates/admin/menus.xml
===================================================================
--- plog/trunk/templates/admin/menus.xml	2004-12-22 15:01:30 UTC (rev 561)
+++ plog/trunk/templates/admin/menus.xml	2004-12-22 15:14:01 UTC (rev 562)
@@ -18,7 +18,7 @@
   		  <newCustomField url="?op=newCustomField" blogOwner="1" />
 		</manageCustomFields>
 	</Manage>
-	<resourceCenter url="?op=resourceCenter">
+	<resourceCenter url="?op=resources">
 		<resources url="?op=resources" />	
 		<newResourceAlbum url="?op=newResourceAlbum" />
 		<newResource url="?op=newResource" />

Modified: plog/trunk/templates/admin/resources.template
===================================================================
--- plog/trunk/templates/admin/resources.template	2004-12-22 15:01:30 UTC (rev 561)
+++ plog/trunk/templates/admin/resources.template	2004-12-22 15:14:01 UTC (rev 562)
@@ -111,9 +111,10 @@
 </table>
 </div>
 <div id="list_action_bar">
+  {$locale->tr("num_resources")}: <strong>{$totalresources}</strong>, {$locale->tr("total_size")}: <strong>{$quotausage|round}</strong>
+  {if $quota > 0 }, {$locale->tr("quota")}: <strong>{$quota|round}</strong>{/if}
   <input type="submit" name="delete_selected" value="{$locale->tr("delete_selected")}" class="submit" />
   <input type="hidden" name="op" value="deleteResourceItems" />
 </div>
-</form>
 {include file="$admintemplatepath/footernavigation.template"}
 {include file="$admintemplatepath/footer.template"}
\ No newline at end of file




More information about the pLog-svn mailing list