[mxbb-commits] mx_radiocast/admin admin_radio_auth.php, 1.5, 1.6 admin_radio_cat.php, 1.6, 1.7 admin_radio_cfg.php, 1.5, 1.6 admin_radio_ext.php, 1.6, 1.7

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/mx_radiocast/admin
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23830/admin

Modified Files:
	admin_radio_auth.php admin_radio_cat.php admin_radio_cfg.php 
	admin_radio_ext.php 
Log Message:
Version 2.9.3

Index: admin_radio_ext.php
===================================================================
RCS file: /cvsroot/mxbb/mx_radiocast/admin/admin_radio_ext.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** admin_radio_ext.php	17 Jun 2013 16:11:28 -0000	1.6
--- admin_radio_ext.php	22 Jul 2013 18:12:14 -0000	1.7
***************
*** 16,22 ****
  }
  
- //
  // Let's set the root dir for phpBB
! //
  $module_root_path = '../';
  $mx_root_path = '../../../';
--- 16,21 ----
  }
  
  // Let's set the root dir for phpBB
! @define('IN_PORTAL', 1);
  $module_root_path = '../';
  $mx_root_path = '../../../';
***************
*** 26,32 ****
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
  
- //
  // Get general radiocast information
- //
  include($radiocast_root_path . 'radiocast_common.'.$phpEx);
  // include_once( $module_root_path . 'radiocast_mod/radiocast_constants.'.$phpEx );
--- 25,29 ----

Index: admin_radio_cat.php
===================================================================
RCS file: /cvsroot/mxbb/mx_radiocast/admin/admin_radio_cat.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** admin_radio_cat.php	17 Jun 2013 16:11:28 -0000	1.6
--- admin_radio_cat.php	22 Jul 2013 18:12:14 -0000	1.7
***************
*** 16,22 ****
  }
  
- //
  // Let's set the root dir for phpBB
! //
  $module_root_path = './../';
  $mx_root_path = './../../../';
--- 16,21 ----
  }
  
  // Let's set the root dir for phpBB
! @define('IN_PORTAL', 1);
  $module_root_path = './../';
  $mx_root_path = './../../../';
***************
*** 26,32 ****
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
  
- //
  // Get general music information
- //
  include($radiocast_root_path . 'radiocast_common.'.$phpEx);
  
--- 25,29 ----

Index: admin_radio_auth.php
===================================================================
RCS file: /cvsroot/mxbb/mx_radiocast/admin/admin_radio_auth.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** admin_radio_auth.php	17 Jun 2013 16:11:28 -0000	1.5
--- admin_radio_auth.php	22 Jul 2013 18:12:14 -0000	1.6
***************
*** 16,22 ****
  }
  
! //
  // Let's set the root dir for phpBB
- //
  $module_root_path = '../';
  $mx_root_path = '../../../';
--- 16,21 ----
  }
  
! @define('IN_PORTAL', 1);
  // Let's set the root dir for phpBB
  $module_root_path = '../';
  $mx_root_path = '../../../';
***************
*** 26,32 ****
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
  
- //
  // Get general radiocast information
- //
  include($radiocast_root_path . 'radiocast_common.'.$phpEx);
  
--- 25,29 ----
***************
*** 121,128 ****
  		);
  
  		// Get the list of phpBB usergroups
  		$sql = "SELECT group_id, group_name
  				FROM " . GROUPS_TABLE . "
! 				WHERE group_single_user <> " . TRUE ."
  				ORDER BY group_name ASC";
  		if ( !($result = $db->sql_query($sql)) )
--- 118,136 ----
  		);
  
+ 		switch (PORTAL_BACKEND)
+ 		{
+ 			case 'internal':
+ 			case 'phpbb2':
+ 				$sql_where = 'group_single_user <> " . true . "';
+ 			break;
+ 
+ 			case 'phpbb3':
+ 				$sql_where = 'group_id <> " . true . "';
+ 			break;
+ 		}
  		// Get the list of phpBB usergroups
  		$sql = "SELECT group_id, group_name
  				FROM " . GROUPS_TABLE . "
! 				WHERE " . $sql_where . "
  				ORDER BY group_name ASC";
  		if ( !($result = $db->sql_query($sql)) )

Index: admin_radio_cfg.php
===================================================================
RCS file: /cvsroot/mxbb/mx_radiocast/admin/admin_radio_cfg.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** admin_radio_cfg.php	17 Jun 2013 16:11:28 -0000	1.5
--- admin_radio_cfg.php	22 Jul 2013 18:12:14 -0000	1.6
***************
*** 16,22 ****
  }
  
- //
  // Let's set the root dir for phpBB
! //
  $module_root_path = '../';
  $mx_root_path = '../../../';
--- 16,21 ----
  }
  
  // Let's set the root dir for phpBB
! @define('IN_PORTAL', 1);
  $module_root_path = '../';
  $mx_root_path = '../../../';
***************
*** 26,32 ****
  require($mx_root_path . 'admin/pagestart.' . $phpEx);
  
- //
  // Get general music information
- //
  include($radiocast_root_path . 'radiocast_common.'.$phpEx);
  
--- 25,29 ----