tonsa fixes

voitto · Apr 25, 2009 · f8aa364 · f8aa364
1 parent c0ea47e
commit f8aa364
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 6 deletions.
diff --git a/app/identica/plugins/identica.php b/app/identica/plugins/identica.php
@@ -6,6 +6,9 @@
 // the "hook" function itself
 function send_to_identica( &$model, &$rec ) {
 
+  if (!get_profile_id())
+    return;
+
   // if the Record does not have a title or uri, bail out
   if (!(isset($rec->title)) || !(isset($rec->uri)))
     return;

diff --git a/app/omb/plugins/email_group.php b/app/omb/plugins/email_group.php
@@ -11,6 +11,9 @@ function send_email_notice( &$model, &$rec ) {
   global $db;
   global $request;
 
+  if (!(get_profile_id() && $request->resource == 'groups'))
+    return;
+
   // get data modesl for 3 tables
   $Entry =&  $db->get_table( 'entries' );
   $Group =&  $db->get_table( 'groups'  );
@@ -42,7 +45,7 @@ function send_email_notice( &$model, &$rec ) {
   $datamodel =& $db->get_table($notify_table);
 
   // get the profile data for the current user
-  $profile = get_profile();
+  $profile = owner_of($rec);
 
   // loop over each group
   while ($g = $Group->MoveNext()) {

diff --git a/app/omb/plugins/omb.php b/app/omb/plugins/omb.php
@@ -1061,8 +1061,6 @@ function oauth_omb_post( &$vars ) {
     exit;
   }
 
-  $response->set_var('profile',$sender);
-
   $Subscription =& $db->model('Subscription');
 
   $sub = $Subscription->find_by( array(

diff --git a/app/omb/plugins/omb_notice.php b/app/omb/plugins/omb_notice.php
@@ -20,7 +20,7 @@ function broadcast_omb_notice( &$model, &$rec ) {
     'wp-oauth'
   ));
 
-  $i = get_profile();
+  $i = owner_of($rec);
 
   $listenee_uri = $i->profile;
 

diff --git a/app/omb/plugins/ping.php b/app/omb/plugins/ping.php
@@ -10,6 +10,9 @@ function send_ping( &$model, &$rec ) {
   $notify_table = $model->table;
   $recid = $rec->id;
 
+  if (!(get_profile_id()))
+    return;
+
   if (array_key_exists( 'target_id', $model->field_array )) {
     $e = $Entry->find($rec->attributes['target_id']);
     if ($e) {

diff --git a/app/omb/plugins/sms_notice.php b/app/omb/plugins/sms_notice.php
@@ -27,7 +27,7 @@ function mobile_event( &$vars ) {
       $p->set_etag($i->person_id);
 
     $response->set_var('profile',$i);
-
+    load_apps();
     trigger_after( 'insert_from_post', $Post, $p );
 
     $response = "";

diff --git a/app/omb/views/admin/index.html b/app/omb/views/admin/index.html
@@ -106,7 +106,7 @@
         });
         $(".editable_select_tw_text").editable(submit_to, { 
             indicator   : "<img src='<?php base_path(); ?>resource/jeditable/indicator.gif'>",
-               data     : '<?php $json = new Services_JSON(); echo $json->encode( $aktwitter_tw_text_options ); ?>',
+               data     : '<?php if (!class_exists("Services_JSON")) lib_include("json"); $json = new Services_JSON(); echo $json->encode( $aktwitter_tw_text_options ); ?>',
             submitdata  : function() {
               return {"entry[etag]" : "<?php echo $threadentry->etag; ?>"};
             },

diff --git a/app/twitter/plugins/twitter.php b/app/twitter/plugins/twitter.php
@@ -6,6 +6,9 @@
 // the "hook" function itself
 function send_to_twitter( &$model, &$rec ) {
 
+  if (!get_profile_id())
+    return;
+
   // if the Record does not have a title or uri, bail out
   if (!(isset($rec->title)) || !(isset($rec->uri)))
     return;