/[drupal]/contributions/modules/storm/stormproject/stormproject.admin.inc
ViewVC logotype

Diff of /contributions/modules/storm/stormproject/stormproject.admin.inc

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

revision 1.8, Tue May 20 08:12:38 2008 UTC revision 1.9, Tue Jul 1 07:47:43 2008 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: stormproject.admin.inc,v 1.7 2008/05/19 08:17:41 robertogerola Exp $  // $Id: stormproject.admin.inc,v 1.8 2008/05/20 08:12:38 robertogerola Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 40  function stormproject_list() { Line 40  function stormproject_list() {
40      ),      ),
41    );    );
42    
43    $s  = "SELECT n.*, spr.* FROM {stormproject} spr INNER JOIN {node} n ON n.nid=spr.nid WHERE n.status=1 AND n.type='stormproject'";    $s  = "SELECT n.*, spr.* FROM {node} AS n INNER JOIN {stormproject} AS spr ON n.vid=spr.vid WHERE n.status=1 AND n.type='stormproject'";
44    
45    $where = array();    $where = array();
46    if ($_SESSION['stormproject_list_filter']['organization_nid']) {    if ($_SESSION['stormproject_list_filter']['organization_nid']) {
# Line 58  function stormproject_list() { Line 58  function stormproject_list() {
58    
59    $tablesort = tablesort_sql($header);    $tablesort = tablesort_sql($header);
60    
61    $s = db_rewrite_sql($s, 'stormproject', 'nid');    $s = db_rewrite_sql($s);
62    $s = stormproject_access_sql($s, $where) . $tablesort;    $s = stormproject_access_sql($s, $where) . $tablesort;
63    $r = pager_query($s, $itemsperpage, 0, NULL);    $r = pager_query($s, $itemsperpage, 0, NULL);
64    
# Line 98  function stormproject_list_filter() { Line 98  function stormproject_list_filter() {
98          '#theme' => 'stormproject_list_filter',          '#theme' => 'stormproject_list_filter',
99    );    );
100    
101    $s = "SELECT nid, title FROM {node} n WHERE status=1 AND type='stormorganization' ORDER BY title ";    $s = "SELECT n.nid, n.title FROM {node} AS n INNER JOIN {stormorganization} AS sor ON n.vid=sor.vid WHERE n.status=1 AND n.type='stormorganization' ORDER BY n.title ";
102      $s = db_rewrite_sql($s);
103    $r = db_query(stormorganization_access_sql($s));    $r = db_query(stormorganization_access_sql($s));
104    
105    $organizations = array();    $organizations = array();
# Line 175  function _stormproject_organization_proj Line 176  function _stormproject_organization_proj
176    $projects = array();    $projects = array();
177    
178    if ($organization_nid) {    if ($organization_nid) {
179      $r = db_query(stormproject_access_sql("SELECT n.nid, n.title FROM {stormproject} spr INNER JOIN {node} n ON n.nid=spr.nid WHERE n.status=1 AND n.type='stormproject' AND spr.organization_nid=%d ORDER BY n.title"), $organization_nid);      $s = "SELECT n.nid, n.title FROM {node} n INNER JOIN {stormproject} AS spr ON n.vid=spr.vid WHERE n.status=1 AND n.type='stormproject' AND spr.organization_nid=%d ORDER BY n.title";
180        $s = db_rewrite_sql($s);
181        $r = db_query(stormproject_access_sql($s), $organization_nid);
182    
183      while ($item = db_fetch_object($r)) {      while ($item = db_fetch_object($r)) {
184        $nid = $item->nid;        $nid = $item->nid;
Legend:
Removed from v.1.8  
changed lines
  Added in v.1.9
  ViewVC Help
Powered by ViewVC 1.1.2