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

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

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

revision 1.4.4.7, Mon Jul 28 14:24:43 2008 UTC revision 1.4.4.8, Fri Aug 1 08:15:10 2008 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: storminvoice.module,v 1.4.4.6 2008/07/23 19:37:49 robertogerola Exp $  // $Id: storminvoice.module,v 1.4.4.7 2008/07/28 14:24:43 robertogerola Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 119  function storminvoice_access_sql($sql, $ Line 119  function storminvoice_access_sql($sql, $
119    return storm_rewrite_sql($sql, $where);    return storm_rewrite_sql($sql, $where);
120  }  }
121    
122  function storminvoice_storm_rewrite_where_sql($query, $primary_table ='n', $account = NULL) {  function storminvoice_storm_rewrite_where_sql($query, $primary_table, $account) {
123    static $conds = array();    static $conds = array();
124    
   if (!$account) {  
     global $user;  
     $account = $user;  
   }  
   
125    if ($conds[$account->uid]) {    if ($conds[$account->uid]) {
126      return $conds[$account->uid];      return $conds[$account->uid];
127    }    }
# Line 145  function storminvoice_storm_rewrite_wher Line 140  function storminvoice_storm_rewrite_wher
140      }      }
141      if (user_access('Storm invoice: view of user organization', $account)) {      if (user_access('Storm invoice: view of user organization', $account)) {
142        if ($cond) $cond .= ' OR ';        if ($cond) $cond .= ' OR ';
143        $cond .= 'sin1.organization_nid='. $account->stormorganization_nid;        $cond .= ' sin1.organization_nid='. $account->stormorganization_nid;
144      }      }
145      if ($cond) {      if ($cond) {
146        $cond = "WHEN 'storminvoice' THEN (SELECT IF($cond,1,0) FROM {storminvoice} sin1 WHERE sin1.vid=${primary_table}.vid) ";        $cond = " WHEN 'storminvoice' THEN (SELECT IF($cond,1,0) FROM {storminvoice} sin1 WHERE sin1.vid=${primary_table}.vid) ";
147      }      }
148      else {      else {
149        $cond = "WHEN 'storminvoice' THEN 0 ";        $cond = " WHEN 'storminvoice' THEN 0 ";
150      }      }
151    }    }
152    
# Line 453  function _storminvoice_beforesave(&$node Line 448  function _storminvoice_beforesave(&$node
448    if (is_array($node->duedate)) $node->duedate = _storm_date_to_gmtimestamp($node->duedate);    if (is_array($node->duedate)) $node->duedate = _storm_date_to_gmtimestamp($node->duedate);
449    if (is_array($node->paymentdate)) $node->paymentdate = _storm_date_to_gmtimestamp($node->paymentdate);    if (is_array($node->paymentdate)) $node->paymentdate = _storm_date_to_gmtimestamp($node->paymentdate);
450    
451    $s = "SELECT n.title    $s = "SELECT n.title FROM {node} AS n
452          FROM {node} AS n INNER JOIN {stormorganization} AS o ON n.vid=o.vid          INNER JOIN {stormorganization} AS o ON n.vid=o.vid
453          WHERE type='stormorganization' AND n.nid=%d";          WHERE type='stormorganization' AND n.nid=%d";
454    $r = db_query($s, $node->organization_nid);    $r = db_query($s, $node->organization_nid);
455    $o = db_fetch_object($r);    $o = db_fetch_object($r);
456    $node->organization_title = $o->title;    $node->organization_title = $o->title;
457    
458    $s = "SELECT n.title    $s = "SELECT n.title FROM {node} AS n
459          FROM {node} AS n INNER JOIN {stormproject} AS p ON n.vid=p.vid          INNER JOIN {stormproject} AS p ON n.vid=p.vid
460          WHERE type='stormproject' AND n.nid=%d";          WHERE type='stormproject' AND n.nid=%d";
461    $r = db_query($s, $node->project_nid);    $r = db_query($s, $node->project_nid);
462    $p = db_fetch_object($r);    $p = db_fetch_object($r);
Legend:
Removed from v.1.4.4.7  
changed lines
  Added in v.1.4.4.8
  ViewVC Help
Powered by ViewVC 1.1.2