[mxbb-commits] mx_gallery2/includes gallery_constants.php, 1.6, 1.7 gallery_functions.php, 1.5, 1.6

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/mxbb/mx_gallery2/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31781/includes

Modified Files:
	gallery_constants.php gallery_functions.php 
Log Message:
Final updates mxBB -> MXP and alike...

Index: gallery_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_gallery2/includes/gallery_constants.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gallery_constants.php	5 May 2007 20:21:55 -0000	1.6
--- gallery_constants.php	3 Jun 2008 20:07:58 -0000	1.7
***************
*** 2,10 ****
  /**
  *
! * @package mxBB Portal Module - mx_gallery2
  * @version $Id$
! * @copyright (c) 2002-2006 [menalto.gallery.com, Jon Ohlsson] mxBB Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mxbb.net
  *
  */
--- 2,10 ----
  /**
  *
! * @package MX-Publisher Module - mx_gallery2
  * @version $Id$
! * @copyright (c) 2002-2006 [menalto.gallery.com, Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.MX-Publisher.com
  *
  */
***************
*** 35,39 ****
  	$mx_user->extend(MX_LANG_MAIN, MX_IMAGES_NONE);

! 	$mx_page->add_copyright( 'mxBB Gallery2 Module' );
  }

--- 35,39 ----
  	$mx_user->extend(MX_LANG_MAIN, MX_IMAGES_NONE);

! 	$mx_page->add_copyright( 'MXP Gallery2 Module' );
  }

Index: gallery_functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_gallery2/includes/gallery_functions.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gallery_functions.php	5 May 2007 20:21:55 -0000	1.5
--- gallery_functions.php	3 Jun 2008 20:07:59 -0000	1.6
***************
*** 2,10 ****
  /**
  *
! * @package mxBB Portal Module - mx_gallery2
  * @version $Id$
! * @copyright (c) 2002-2006 [menalto.gallery.com, Jon Ohlsson] mxBB Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mxbb.net
  *
  */
--- 2,10 ----
  /**
  *
! * @package MX-Publisher Module - mx_gallery2
  * @version $Id$
! * @copyright (c) 2002-2006 [menalto.gallery.com, Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.MX-Publisher.com
  *
  */
***************
*** 130,134 ****
  // Define some vars
  //
! define('MAP_USERGROUP_ID', 2); // This is the externalgroupId mapped to the gallery mxBB user group
  define('MAP_ADMINGROUP_ID', 3); // This is the "handle" to the gallery admin group

--- 130,134 ----
  // Define some vars
  //
! define('MAP_USERGROUP_ID', 2); // This is the externalgroupId mapped to the gallery MX-Publisher user group
  define('MAP_ADMINGROUP_ID', 3); // This is the "handle" to the gallery admin group

***************
*** 279,283 ****

  		//
! 		// Validate if the mxBB is already mapped in Gallery2
  		//
  		$sql = "SELECT *
--- 279,283 ----

  		//
! 		// Validate if the MX-Publisher is already mapped in Gallery2
  		//
  		$sql = "SELECT *
***************
*** 317,321 ****

  		//
! 		// Validate if the mxBB is already mapped in Gallery2
  		// Since phpBB will not allow users with the same 'username' or 'email', this check is sufficient
  		//
--- 317,321 ----

  		//
! 		// Validate if the MX-Publisher is already mapped in Gallery2
  		// Since phpBB will not allow users with the same 'username' or 'email', this check is sufficient
  		//
***************
*** 378,388 ****

  				//
! 				// First validate the mxBB user - to avoid duplicate Gallery users
! 				// For exdample the mxBB admin may have configured the Gallery admin account WITH THE SAME EMAIL
  				//
  				if ($this->_is_gallery_user())
  				{
  					//
! 					// There already exists a gallery user with similar userdata as current mxBB user (username or email)
  					// Map to this gallery user and update gallery user data
  					// Do NOT create new user
--- 378,388 ----

  				//
! 				// First validate the MX-Publisher user - to avoid duplicate Gallery users
! 				// For exdample the MX-Publisher admin may have configured the Gallery admin account WITH THE SAME EMAIL
  				//
  				if ($this->_is_gallery_user())
  				{
  					//
! 					// There already exists a gallery user with similar userdata as current MX-Publisher user (username or email)
  					// Map to this gallery user and update gallery user data
  					// Do NOT create new user
***************
*** 391,395 ****

  					//
! 					// Map mxBB user to existing Gallery user
  					//
  					if ( !$this->_g2addexternalMapEntry($user_id, $this->user_gallery_user_data['g_id'], MAP_MXBB_USER) )
--- 391,395 ----

  					//
! 					// Map MX-Publisher user to existing Gallery user
  					//
  					if ( !$this->_g2addexternalMapEntry($user_id, $this->user_gallery_user_data['g_id'], MAP_MXBB_USER) )
***************
*** 422,431 ****

  				//
! 				// Add a mxBB user group (if not exists)
  				//
  				list ($ret, $group) = GalleryCoreApi::loadEntityByExternalId(MAP_USERGROUP_ID, 'GalleryGroup');
  				if ($ret->isError())
  				{
! 					$map_debug .= '<br>Adding mxBB user group...';

  				   //
--- 422,431 ----

  				//
! 				// Add a MX-Publisher user group (if not exists)
  				//
  				list ($ret, $group) = GalleryCoreApi::loadEntityByExternalId(MAP_USERGROUP_ID, 'GalleryGroup');
  				if ($ret->isError())
  				{
! 					$map_debug .= '<br>Adding MX-Publisher user group...';

  				   //
***************
*** 436,440 ****
  					if ( !$ret->isSuccess() )
  					{
! 						$map_debug .= 'ERROR: Could not create mxBB user group';
  						$failures[] = $user_id;
  						$map_ok = false;
--- 436,440 ----
  					if ( !$ret->isSuccess() )
  					{
! 						$map_debug .= 'ERROR: Could not create MX-Publisher user group';
  						$failures[] = $user_id;
  						$map_ok = false;
***************
*** 443,450 ****

  				$ret = GalleryEmbed :: addUserToGroup($user_id, MAP_USERGROUP_ID);
! 				$map_debug .= '<br>Adding user to mxBB user group...';
  				if ( !$ret->isSuccess() )
  				{
! 					$map_debug .= 'ERROR: Could not add user to mxBB user group';
  					$failures[] = $user_id;
  					$map_ok = false;
--- 443,450 ----

  				$ret = GalleryEmbed :: addUserToGroup($user_id, MAP_USERGROUP_ID);
! 				$map_debug .= '<br>Adding user to MX-Publisher user group...';
  				if ( !$ret->isSuccess() )
  				{
! 					$map_debug .= 'ERROR: Could not add user to MX-Publisher user group';
  					$failures[] = $user_id;
  					$map_ok = false;
***************
*** 490,497 ****

  					$ret = GalleryEmbed :: addUserToGroup($user_id, MAP_ADMINGROUP_ID);
! 					$map_debug .= '<br>Adding user to mxBB admin group...';
  					if ( !$ret->isSuccess() )
  					{
! 						$map_debug .= 'ERROR: Could not add user to mxBB admin group';
  						$failures[] = $user_id;
  						$map_ok = false;
--- 490,497 ----

  					$ret = GalleryEmbed :: addUserToGroup($user_id, MAP_ADMINGROUP_ID);
! 					$map_debug .= '<br>Adding user to MX-Publisher admin group...';
  					if ( !$ret->isSuccess() )
  					{
! 						$map_debug .= 'ERROR: Could not add user to MX-Publisher admin group';
  						$failures[] = $user_id;
  						$map_ok = false;
***************
*** 545,550 ****
  	// TO_DO
  	//
! 	Deleted mxBB users
! 	Former mxBB admins
  	*/
  }
--- 545,550 ----
  	// TO_DO
  	//
! 	Deleted MX-Publisher users
! 	Former MX-Publisher admins
  	*/
  }