View | Details | Raw Unified | Return to bug 6068 | Differences between
and this patch

Collapse All | Expand All

(-)a/classes/security/RoleDAO.inc.php (-6 / +6 lines)
 Lines 158-164   class RoleDAO extends DAO { Link Here 
158 

          158
          

        

        

          159
          
		$users = array();

          159
          
		$users = array();

        

        

          160
          

          160
          

        

          
            

              161
              
		$paramArray = array('interest');


              161
              
		$paramArray = array(ASSOC_TYPE_USER, 'interest');

            

        

          162
          
		if (isset($roleId)) $paramArray[] = (int) $roleId;

          162
          
		if (isset($roleId)) $paramArray[] = (int) $roleId;

        

        

          163
          
		if (isset($conferenceId)) $paramArray[] = (int) $conferenceId;

          163
          
		if (isset($conferenceId)) $paramArray[] = (int) $conferenceId;

        

        

          164
          
		if (isset($schedConfId)) $paramArray[] = (int) $schedConfId;

          164
          
		if (isset($schedConfId)) $paramArray[] = (int) $schedConfId;

        

  

    

    

       Lines 207-213
      class RoleDAO extends DAO { 
    
  Link Here 
    

  

        

          207
          
		$searchSql .= ($sortBy?(' ORDER BY ' . $this->getSortMapping($sortBy) . ' ' . $this->getDirectionMapping($sortDirection)) : '');

          207
          
		$searchSql .= ($sortBy?(' ORDER BY ' . $this->getSortMapping($sortBy) . ' ' . $this->getDirectionMapping($sortDirection)) : '');

        

        

          208
          

          208
          

        

        

          209
          
		$result =& $this->retrieveRange(

          209
          
		$result =& $this->retrieveRange(

        

          
            

              210
              
			'SELECT DISTINCT u.* FROM users AS u LEFT JOIN controlled_vocabs cv ON (cv.assoc_id = u.user_id AND cv.symbolic = ?)


              210
              
			'SELECT DISTINCT u.* FROM users AS u LEFT JOIN controlled_vocabs cv ON (cv.assoc_type = ? AND cv.assoc_id = u.user_id AND cv.symbolic = ?)

            

        

          211
          
				LEFT JOIN controlled_vocab_entries cve ON (cve.controlled_vocab_id = cv.controlled_vocab_id)

          211
          
				LEFT JOIN controlled_vocab_entries cve ON (cve.controlled_vocab_id = cv.controlled_vocab_id)

        

        

          212
          
				LEFT JOIN controlled_vocab_entry_settings cves ON (cves.controlled_vocab_entry_id = cve.controlled_vocab_entry_id),

          212
          
				LEFT JOIN controlled_vocab_entry_settings cves ON (cves.controlled_vocab_entry_id = cve.controlled_vocab_entry_id),

        

        

          213
          
				roles AS r WHERE u.user_id = r.user_id ' .

          213
          
				roles AS r WHERE u.user_id = r.user_id ' .

        

  

    

    

       Lines 235-241
      class RoleDAO extends DAO { 
    
  Link Here 
    

  

        

          235
          
	function &getUsersByConferenceId($conferenceId, $searchType = null, $search = null, $searchMatch = null, $dbResultRange = null, $sortBy = null, $sortDirection = SORT_DIRECTION_ASC) {

          235
          
	function &getUsersByConferenceId($conferenceId, $searchType = null, $search = null, $searchMatch = null, $dbResultRange = null, $sortBy = null, $sortDirection = SORT_DIRECTION_ASC) {

        

        

          236
          
		$users = array();

          236
          
		$users = array();

        

        

          237
          

          237
          

        

          
            

              238
              
		$paramArray = array('interest', (int) $conferenceId);


              238
              
		$paramArray = array(ASSOC_TYPE_USER, 'interest', (int) $conferenceId);

            

        

          239
          
		$searchSql = '';

          239
          
		$searchSql = '';

        

        

          240
          

          240
          

        

        

          241
          
		$searchTypeMap = array(

          241
          
		$searchTypeMap = array(

        

  

    

    

       Lines 277-283
      class RoleDAO extends DAO { 
    
  Link Here 
    

  

        

          277
          

          277
          

        

        

          278
          
		$result =& $this->retrieveRange(

          278
          
		$result =& $this->retrieveRange(

        

        

          279
          

          279
          

        

          
            

              280
              
			'SELECT DISTINCT u.* FROM users AS u LEFT JOIN controlled_vocabs cv ON (cv.assoc_id = u.user_id AND cv.symbolic = ?)


              280
              
			'SELECT DISTINCT u.* FROM users AS u LEFT JOIN controlled_vocabs cv ON (cv.assoc_type = ? AND cv.assoc_id = u.user_id AND cv.symbolic = ?)

            

        

          281
          
				LEFT JOIN controlled_vocab_entries cve ON (cve.controlled_vocab_id = cv.controlled_vocab_id)

          281
          
				LEFT JOIN controlled_vocab_entries cve ON (cve.controlled_vocab_id = cv.controlled_vocab_id)

        

        

          282
          
				LEFT JOIN controlled_vocab_entry_settings cves ON (cves.controlled_vocab_entry_id = cve.controlled_vocab_entry_id),

          282
          
				LEFT JOIN controlled_vocab_entry_settings cves ON (cves.controlled_vocab_entry_id = cve.controlled_vocab_entry_id),

        

        

          283
          
				roles AS r WHERE u.user_id = r.user_id AND r.conference_id = ? ' . $searchSql,

          283
          
				roles AS r WHERE u.user_id = r.user_id AND r.conference_id = ? ' . $searchSql,

        

  

    

    

       Lines 301-307
      class RoleDAO extends DAO { 
    
  Link Here 
    

  

        

          301
          
	function &getUsersBySchedConfId($schedConfId, $searchType = null, $search = null, $searchMatch = null, $dbResultRange = null, $sortBy = null, $sortDirection = SORT_DIRECTION_ASC) {

          301
          
	function &getUsersBySchedConfId($schedConfId, $searchType = null, $search = null, $searchMatch = null, $dbResultRange = null, $sortBy = null, $sortDirection = SORT_DIRECTION_ASC) {

        

        

          302
          
		$users = array();

          302
          
		$users = array();

        

        

          303
          

          303
          

        

          
            

              304
              
		$paramArray = array('interest', (int) $schedConfId);


              304
              
		$paramArray = array(ASSOC_TYPE_USER, 'interest', (int) $schedConfId);

            

        

          305
          
		$searchSql = '';

          305
          
		$searchSql = '';

        

        

          306
          

          306
          

        

        

          307
          
		if (!empty($search)) switch ($searchType) {

          307
          
		if (!empty($search)) switch ($searchType) {

        

  

    

    

       Lines 339-345
      class RoleDAO extends DAO { 
    
  Link Here 
    

  

        

          339
          

          339
          

        

        

          340
          
		$result =& $this->retrieveRange(

          340
          
		$result =& $this->retrieveRange(

        

        

          341
          

          341
          

        

          
            

              342
              
			'SELECT DISTINCT u.* FROM users AS u LEFT JOIN controlled_vocabs cv ON (cv.assoc_id = u.user_id AND cv.symbolic = ?)


              342
              
			'SELECT DISTINCT u.* FROM users AS u LEFT JOIN controlled_vocabs cv ON (cv.assoc_type = ? AND cv.assoc_id = u.user_id AND cv.symbolic = ?)

            

        

          343
          
				LEFT JOIN controlled_vocab_entries cve ON (cve.controlled_vocab_id = cv.controlled_vocab_id)

          343
          
				LEFT JOIN controlled_vocab_entries cve ON (cve.controlled_vocab_id = cv.controlled_vocab_id)

        

        

          344
          
				LEFT JOIN controlled_vocab_entry_settings cves ON (cves.controlled_vocab_entry_id = cve.controlled_vocab_entry_id),

          344
          
				LEFT JOIN controlled_vocab_entry_settings cves ON (cves.controlled_vocab_entry_id = cve.controlled_vocab_entry_id),

        

        

          345
          
				roles AS r WHERE u.user_id = r.user_id AND r.sched_conf_id = ? ' . $searchSql,

          345
          
				roles AS r WHERE u.user_id = r.user_id AND r.sched_conf_id = ? ' . $searchSql,

        



(-)a/classes/submission/director/DirectorSubmissionDAO.inc.php
      (-1 / +2 lines)




  

    

    

       Lines 518-523
      class DirectorSubmissionDAO extends DAO { 
    
  Link Here 
    

  

        

          518
          
		$users = array();

          518
          
		$users = array();

        

        

          519
          

          519
          

        

        

          520
          
		$paramArray = array(

          520
          
		$paramArray = array(

        

            

              
              
              521
              
			ASSOC_TYPE_USER,

            

        

          521
          
			'interest',

          522
          
			'interest',

        

        

          522
          
			$paperId,

          523
          
			$paperId,

        

        

          523
          
			$schedConfId,

          524
          
			$schedConfId,

        

  

    

    

       Lines 567-573
      class DirectorSubmissionDAO extends DAO { 
    
  Link Here 
    

  

        

          567
          
				u.*

          568
          
				u.*

        

        

          568
          
			FROM	users u

          569
          
			FROM	users u

        

        

          569
          
				LEFT JOIN roles r ON (r.user_id = u.user_id)

          570
          
				LEFT JOIN roles r ON (r.user_id = u.user_id)

        

          
            

              570
              
				LEFT JOIN controlled_vocabs cv ON (cv.assoc_id = u.user_id AND cv.symbolic = ?)


              571
              
				LEFT JOIN controlled_vocabs cv ON (cv.assoc_type = ? AND cv.assoc_id = u.user_id AND cv.symbolic = ?)

            

        

          571
          
				LEFT JOIN controlled_vocab_entries cve ON (cve.controlled_vocab_id = cv.controlled_vocab_id)

          572
          
				LEFT JOIN controlled_vocab_entries cve ON (cve.controlled_vocab_id = cv.controlled_vocab_id)

        

        

          572
          
				LEFT JOIN controlled_vocab_entry_settings cves ON (cves.controlled_vocab_entry_id = cve.controlled_vocab_entry_id)

          573
          
				LEFT JOIN controlled_vocab_entry_settings cves ON (cves.controlled_vocab_entry_id = cve.controlled_vocab_entry_id)

        

        

          573
          
				LEFT JOIN edit_assignments e ON (e.director_id = u.user_id AND e.paper_id = ?)

          574
          
				LEFT JOIN edit_assignments e ON (e.director_id = u.user_id AND e.paper_id = ?)

        



(-)a/classes/submission/trackDirector/TrackDirectorSubmissionDAO.inc.php
      (-2 / +2 lines)




  

    

    

       Lines 657-663
      class TrackDirectorSubmissionDAO extends DAO { 
    
  Link Here 
    

  

        

          657
          
	 * @return DAOResultFactory containing matching Users

          657
          
	 * @return DAOResultFactory containing matching Users

        

        

          658
          
	 */

          658
          
	 */

        

        

          659
          
	function &getReviewersForPaper($schedConfId, $paperId, $round, $searchType = null, $search = null, $searchMatch = null, $rangeInfo = null, $sortBy = null, $sortDirection = SORT_DIRECTION_ASC) {

          659
          
	function &getReviewersForPaper($schedConfId, $paperId, $round, $searchType = null, $search = null, $searchMatch = null, $rangeInfo = null, $sortBy = null, $sortDirection = SORT_DIRECTION_ASC) {

        

          
            

              660
              
		$paramArray = array($paperId, $round, 'interest', $schedConfId, RoleDAO::getRoleIdFromPath('reviewer'));


              660
              
		$paramArray = array($paperId, $round, ASSOC_TYPE_USER, 'interest', $schedConfId, RoleDAO::getRoleIdFromPath('reviewer'));

            

        

          661
          
		$searchSql = '';

          661
          
		$searchSql = '';

        

        

          662
          

          662
          

        

        

          663
          
		$searchTypeMap = array(

          663
          
		$searchTypeMap = array(

        

  

    

    

       Lines 713-719
      class TrackDirectorSubmissionDAO extends DAO { 
    
  Link Here 
    

  

        

          713
          
				LEFT JOIN review_assignments ar ON (ar.reviewer_id = u.user_id AND ar.cancelled = 0 AND ar.submission_id = ? AND ar.round = ?)

          713
          
				LEFT JOIN review_assignments ar ON (ar.reviewer_id = u.user_id AND ar.cancelled = 0 AND ar.submission_id = ? AND ar.round = ?)

        

        

          714
          
				LEFT JOIN roles r ON (r.user_id = u.user_id)

          714
          
				LEFT JOIN roles r ON (r.user_id = u.user_id)

        

        

          715
          
				LEFT JOIN papers p ON (a.submission_id = p.paper_id)

          715
          
				LEFT JOIN papers p ON (a.submission_id = p.paper_id)

        

          
            

              716
              
				LEFT JOIN controlled_vocabs cv ON (cv.assoc_id = u.user_id AND cv.symbolic = ?)


              716
              
				LEFT JOIN controlled_vocabs cv ON (cv.assoc_type = ? AND cv.assoc_id = u.user_id AND cv.symbolic = ?)

            

        

          717
          
				LEFT JOIN controlled_vocab_entries cve ON (cve.controlled_vocab_id = cv.controlled_vocab_id)

          717
          
				LEFT JOIN controlled_vocab_entries cve ON (cve.controlled_vocab_id = cv.controlled_vocab_id)

        

        

          718
          
				LEFT JOIN controlled_vocab_entry_settings cves ON (cves.controlled_vocab_entry_id = cve.controlled_vocab_entry_id)

          718
          
				LEFT JOIN controlled_vocab_entry_settings cves ON (cves.controlled_vocab_entry_id = cve.controlled_vocab_entry_id)

        

        

          719
          
			WHERE	u.user_id = r.user_id AND

          719
          
			WHERE	u.user_id = r.user_id AND

        






  


  Return to bug 6068