Changeset 446

Timestamp:

01/06/08 21:03:23 (12 months ago)

Author:

padams

Message:

- updated Galery plugin to properly handle OWA post actions, not log ItemAdmin? page views, and strip nounce from url.
- added timeout to fetching owa news RSS
- fixed bug in cache where entities were being added to the dirty list twice if a SQL UPDATE occured. Fixed with proper replace method.

Location:

trunk

Files:

• module.inc (modified) (7 diffs)
• modules/base/classes/cache.php (modified) (3 diffs)
• modules/base/classes/entityManager.php (modified) (1 diff)
• modules/base/templates/gallery.tpl (modified) (1 diff)
• modules/base/templates/options_general.tpl (modified) (1 diff)
• owa_news.php (modified) (1 diff)

trunk/module.inc

@@ -74 +74 @@
                 $owa_config['authentication'] = 'gallery';
                 $owa_config['site_id'] = md5($gallery_base_url);
+                $owa_config['query_string_filters'] = 'g2_fromNavId';
                 $owa_config['is_embedded'] = 'true';
                 
@@ -175 +176 @@
                 global $gallery;
                 
-                // get instance of owa
-                $owa = owa_factory();
-                
-                // set user priviledges of the request for OWA to log
-                owa_set_priviledges();
-
-                // Setup OWA request params
-                $params = array();
-                
-                // get user gallery's object to set request variables
-                $params['user_name']= $u->userName;
-        $params['user_email'] = $u->email;      
+                
         if (GalleryUtilities::hasRequestVariable('view')):
                 $viewName = GalleryUtilities::getRequestVariables('view');
+                
+                
                 // ensure this is not a Gallery admin screen
-                if ($viewName != "core.SiteAdmin"):
+                if ($viewName == "core.SiteAdmin" || $viewName == "core.ItemAdmin"):
+                        return;
+                else:
+                        
+                        // get instance of owa
+                                $owa = owa_factory();
+                                
+                                // set user priviledges of the request for OWA to log
+                                owa_set_priviledges();
+                
+                                // Setup OWA request params
+                                $params = array();
+                                
+                                // get user gallery's object to set request variables
+                                //$params['user_name']= $u->userName;
+                                //$params['user_email'] = $u->email;    
                         
                                 // get information on current view      
@@ -224 +231 @@
         }
         
+        
+        /**
+         * Check to see if OWA is installed and activated
+         *
+         */
+        function owa_isActivated() {
+        
+                list ($ret, $params) = GalleryCoreApi::fetchAllPluginParameters('module', 'owa');
+                
+                if (!empty($params)):
+                        return true;
+                else:
+                        return false;
+                endif;
+        }
+        
+        
         /**
      * @see GalleryModule::getSiteAdminViews
@@ -231 +255 @@
         global $gallery;
         
-        $owa = owa_factory();
-                
-                // set user priviledges of the request for OWA
-                owa_set_priviledges();
-        
+        // this is needed becasue on the plugins page this callback is triggered
+        // whether then plugin is active or not for some reason.
+        //if ($this->owa_isActivated()):
+                        // get OWA instance
+                //      $owa = owa_factory();
+                        // set user priviledges of the request for OWA
+                //      owa_set_priviledges();
+                //endif;
+                                        
                 $data = array(array('name' => $this->translate('Dashboard'), 'view' => 'owa.owaDashboard'),
                                           array('name' => $this->translate('Admin Settings'), 'view' => 'owa.owaOptions'));                 
@@ -292 +320 @@
                 
                 $params = array();
-                $params['view'] = 'base.options';
-                $params['subview'] = 'base.optionsGeneral';        
+                
+                 if (empty($owa->params['do'])):
+                if (empty($owa->params['view'])):               
+                                $params['view'] = 'base.options';
+                                $params['subview'] = 'base.optionsGeneral'; 
+                        endif;
+                endif;
+                       
                 $page = $owa->handleRequest($params);
                 $template->setVariable('owa', array('content' => $page));
                 return array(null, array('body' => 'modules/owa/modules/base/templates/gallery.tpl'));
     }
+    
+    /**
+     * Does this view change any data? Only controllers should change data, but AJAX and some
+     * immediate views are handled in views in Gallery.
+     * @return bool true if the view changes data
+     */
+    function isControllerLike() {
+                return true;
+    }
+
                 
 }
@@ -343 +387 @@
                 return array(null, array('body' => 'modules/owa/modules/base/templates/gallery.tpl'));
     }
-                
+        
+        /**
+     * Does this view change any data? Only controllers should change data, but AJAX and some
+     * immediate views are handled in views in Gallery.
+     * @return bool true if the view changes data
+     */
+    function isControllerLike() {
+                return true;
+    }
+                
+}
+
+class owaControlController extends GalleryController {
+
+        /**
+     * @see GalleryController::handleRequest
+     */
+    function handleRequest($form) {
+    
+        $result = array('delegate' => array('view' => 'owa.owaGeneric'),
+                        'status' => 1, 'error' => '');
+        return array(null, $result);
+    
+    }
+
 }
 
@@ -395 +463 @@
                 $viewName = GalleryUtilities::getRequestVariables('view');
                 // ensure this is not a Gallery admin screen
-                if ($viewName != "core.SiteAdmin"):
-
-                
+                
+                if ($viewName == "core.SiteAdmin" || $viewName == "core.ItemAdmin"):
+                        return;
+                else:
                                 /* 2. Load the requested data */
+                                
                                 $owa = owa_factory();
                                 $tags = $owa->placeHelperPageTags(false);

trunk/modules/base/classes/cache.php

@@ -107 +107 @@
         function replace($collection, $key, $value) {
         
-                return $this->set($collection, $key, $value);
+                $hkey = $this->hash($key);
+                $this->cache[$collection][$hkey] = $value;
+                $this->debug(sprintf('Replacing Object in Cache - Collection: %s, id: %s', $collection, $hkey));
+                $this->statistics['replaced']++;
+                
+                if (!in_array($collection, $this->non_persistant_collections)):
+                        if (!in_array($hkey, $this->dirty_objs[$collection])):
+                                $this->dirty_objs[$collection][] = $hkey;
+                                //$this->debug(print_r($this->dirty_objs, true));
+                                $this->dirty_collections[$collection] = true; 
+                                $this->debug(sprintf('Added Object to Dirty List - Collection: %s, id: %s', $collection, $hkey));
+                                $this->statistics['dirty']++;
+                        endif;
+                // check to see if cache file exists and remove it just in case the collection
+                // was recently added to the non persistant list.
+                else:
+                        $this->removeCacheFile($this->makeCollectionDirPath($collection).$hkey.'.php');
+                endif;
+
+                
+                return;
         }
         
@@ -189 +209 @@
                                                   Total Miss: %s
                                                   Total Added to Cache: %s
+                                                  Total Replaced: %s
                                                   Total Persisted: %s
                                                   Total Removed: %s",
@@ -196 +217 @@
                                                   $this->statistics['miss'],
                                                   $this->statistics['added'],
+                                                  $this->statistics['replaced'],
                                                   $this->statistics['dirty'],
                                                   $this->statistics['removed']);

trunk/modules/base/classes/entityManager.php

@@ -145 +145 @@
                 if ($status == true):
                         if ($this->config['cache_objects'] == true):
-                                $this->cache->set(get_class($this->entity), 'id'.$this->entity->id->value, $this->entity);
+                                $this->cache->replace(get_class($this->entity), 'id'.$this->entity->id->value, $this->entity);
                         endif;
                 endif;

trunk/modules/base/templates/gallery.tpl

@@ +1 @@
+<input type="hidden" name="{g->formVar var="controller"}" value="owa.owaControl"/>
 {$owa.content}

trunk/modules/base/templates/options_general.tpl

@@ -3 +3 @@
 <div class="subview_content">
 
-<form method="post">
+<form method="post" name="owa_options">
 
         <fieldset name="owa-options" class="options">

trunk/owa_news.php

@@ -57 +57 @@
                 $this->e = &owa_coreAPI::errorSingleton();
                 $this->crawler = new owa_http;
+                $this->crawler->read_timeout = 10;
                 $this->cache_dir = '';
                 $this->date_format = "F j, Y";