diff options
| -rw-r--r-- | plugins/Autocomplete/autocomplete.php | 54 | ||||
| -rw-r--r-- | plugins/PiwikAnalyticsPlugin.php | 2 |
2 files changed, 51 insertions, 5 deletions
diff --git a/plugins/Autocomplete/autocomplete.php b/plugins/Autocomplete/autocomplete.php index 4379a86f2..aa57b3915 100644 --- a/plugins/Autocomplete/autocomplete.php +++ b/plugins/Autocomplete/autocomplete.php @@ -47,10 +47,48 @@ class AutocompleteAction extends Action { private $result; + /** + * Last-modified date for page + * + * When was the content of this page last modified? Based on notice, + * profile, avatar. + * + * @return int last-modified date as unix timestamp + */ + function lastModified() + { + $max=0; + foreach($this->users as $user){ + $max = max($max,strtotime($user->modified),strtotime($user->profile->modified)); + } + foreach($this->groups as $group){ + $max = max($max,strtotime($group->modified)); + } + return $max; + } + + /** + * An entity tag for this page + * + * Shows the ETag for the page, based on the notice ID and timestamps + * for the notice, profile, and avatar. It's weak, since we change + * the date text "one hour ago", etc. + * + * @return string etag + */ + function etag() + { + return '"' . implode(':', array($this->arg('action'), + crc32($this->arg('q')), //the actual string can have funny characters in we don't want showing up in the etag + $this->arg('limit'), + $this->lastModified())) . '"'; + } + function prepare($args) { parent::prepare($args); - $this->results = array(); + $this->groups=array(); + $this->users=array(); $q = $this->arg('q'); $limit = $this->arg('limit'); if($limit > 200) $limit=200; //prevent DOS attacks @@ -63,7 +101,8 @@ class AutocompleteAction extends Action $user->find(); while($user->fetch()) { $profile = Profile::staticGet($user->id); - $this->results[]=array('nickname' => $user->nickname, 'fullname'=> $profile->fullname, 'type'=>'user'); + $user->profile=$profile; + $this->users[]=$user; } } if(substr($q,0,1)=='!'){ @@ -74,7 +113,7 @@ class AutocompleteAction extends Action $group->whereAdd('nickname like \'' . trim($group->escape($q), '\'') . '%\''); $group->find(); while($group->fetch()) { - $this->results[]=array('nickname' => $group->nickname, 'fullname'=> $group->fullname, 'type'=>'group'); + $this->groups[]=$group; } } return true; @@ -83,7 +122,14 @@ class AutocompleteAction extends Action function handle($args) { parent::handle($args); - foreach($this->results as $result) { + $results = array(); + foreach($this->users as $user){ + $results[]=array('nickname' => $user->nickname, 'fullname'=> $user->profile->fullname, 'type'=>'user'); + } + foreach($this->groups as $group){ + $results[]=array('nickname' => $group->nickname, 'fullname'=> $group->fullname, 'type'=>'group'); + } + foreach($results as $result) { print json_encode($result) . "\n"; } } diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php index e36bd1c5c..8191f5181 100644 --- a/plugins/PiwikAnalyticsPlugin.php +++ b/plugins/PiwikAnalyticsPlugin.php @@ -73,7 +73,7 @@ class PiwikAnalyticsPlugin extends Plugin function __construct($root=null, $id=null) { $this->piwikroot = $root; - $this->piwikid = $id; + $this->piwikId = $id; parent::__construct(); } |