/[drupal]/contributions/modules/storm/stormperson/stormperson.module
ViewVC logotype

Diff of /contributions/modules/storm/stormperson/stormperson.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.7.4.10, Wed Jul 23 19:37:49 2008 UTC revision 1.7.4.11, Fri Aug 1 08:15:10 2008 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: stormperson.module,v 1.7.4.9 2008/07/23 14:27:03 robertogerola Exp $  // $Id: stormperson.module,v 1.7.4.10 2008/07/23 19:37:49 robertogerola Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 128  function stormperson_access_sql($sql, $w Line 128  function stormperson_access_sql($sql, $w
128    return storm_rewrite_sql($sql, $where);    return storm_rewrite_sql($sql, $where);
129  }  }
130    
131  function stormperson_storm_rewrite_where_sql($query, $primary_table ='n', $account = NULL) {  function stormperson_storm_rewrite_where_sql($query, $primary_table, $account) {
132    static $conds = array();    static $conds = array();
133    
   if (!$account) {  
     global $user;  
     $account = $user;  
   }  
   
134    if ($conds[$account->uid]) {    if ($conds[$account->uid]) {
135      return $conds[$account->uid];      return $conds[$account->uid];
136    }    }
# Line 150  function stormperson_storm_rewrite_where Line 145  function stormperson_storm_rewrite_where
145    
146      $cond = '';      $cond = '';
147      if (user_access('Storm person: view own', $account)) {      if (user_access('Storm person: view own', $account)) {
148        $cond .= "${primary_table}.uid=". $account->uid;        $cond .= " ${primary_table}.uid=". $account->uid;
149      }      }
150      if (user_access('Storm person: view of user organization', $account)) {      if (user_access('Storm person: view of user organization', $account)) {
151        if ($cond) $cond .= ' OR ';        if ($cond) $cond .= ' OR ';
152        $cond .= 'spe1.organization_nid='. $account->stormorganization_nid;        $cond .= ' spe1.organization_nid='. $account->stormorganization_nid;
153      }      }
154      if ($cond) {      if ($cond) {
155        $cond = "WHEN 'stormperson' THEN (SELECT IF($cond,1,0) FROM {stormperson} spe1 WHERE spe1.vid=${primary_table}.vid) ";        $cond = " WHEN 'stormperson' THEN (SELECT IF($cond,1,0) FROM {stormperson} spe1 WHERE spe1.vid=${primary_table}.vid) ";
156      }      }
157      else {      else {
158        $cond = "WHEN 'stormperson' THEN 0 ";        $cond = " WHEN 'stormperson' THEN 0 ";
159      }      }
160    }    }
161    
# Line 400  function _stormperson_beforesave(&$node) Line 395  function _stormperson_beforesave(&$node)
395      $node->email = $ass_user->mail;      $node->email = $ass_user->mail;
396    }    }
397    
398    $s = "SELECT n.title    $s = "SELECT n.title FROM {node} AS n INNER JOIN {stormorganization} AS p ON n.nid=p.nid
       FROM {node} AS n INNER JOIN {stormorganization} AS p ON n.nid=p.nid  
399        WHERE type='stormorganization' AND n.nid=%d";        WHERE type='stormorganization' AND n.nid=%d";
400    $r = db_query($s, $node->organization_nid);    $r = db_query($s, $node->organization_nid);
401    $o = db_fetch_object($r);    $o = db_fetch_object($r);
Legend:
Removed from v.1.7.4.10  
changed lines
  Added in v.1.7.4.11
  ViewVC Help
Powered by ViewVC 1.1.2