"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "packages/web/lib/plugins/ldap/class/ldapmanager.class.php" between
fogproject-1.5.5.tar.gz and fogproject-1.5.6.tar.gz

About: FOG is a Linux-based network computer cloning solution for Windows, Mac OSX and various Linux distributions that ties together a few open-source tools with a PHP-based web interface. FOG doesn’t use any boot disks, or CDs; everything is done via TFTP and PXE.

ldapmanager.class.php  (fogproject-1.5.5)	:	ldapmanager.class.php  (fogproject-1.5.6)
skipping to change at line 62		skipping to change at line 62
'lsUserSearchDN',		'lsUserSearchDN',
'lsPort',		'lsPort',
'lsUserNamAttr',		'lsUserNamAttr',
'lsGrpMemberAttr',		'lsGrpMemberAttr',
'lsAdminGroup',		'lsAdminGroup',
'lsUserGroup',		'lsUserGroup',
'lsSearchScope',		'lsSearchScope',
'lsBindDN',		'lsBindDN',
'lsBindPwd',		'lsBindPwd',
'lsGrpSearchDN',		'lsGrpSearchDN',
'lsUseGroupMatch'		'lsUseGroupMatch',
		'lsUserFilter'
),		),
array(		array(
'INTEGER',		'INTEGER',
'VARCHAR(255)',		'VARCHAR(255)',
'LONGTEXT',		'LONGTEXT',
'VARCHAR(40)',		'VARCHAR(40)',
'VARCHAR(255)',		'VARCHAR(255)',
'TIMESTAMP',		'TIMESTAMP',
'LONGTEXT',		'LONGTEXT',
'INTEGER',		'INTEGER',
'VARCHAR(255)',		'VARCHAR(255)',
'VARCHAR(255)',		'VARCHAR(255)',
'LONGTEXT',		'LONGTEXT',
'LONGTEXT',		'LONGTEXT',
"ENUM('0', '1', '2')",		"ENUM('0', '1', '2')",
'LONGTEXT',		'LONGTEXT',
'LONGTEXT',		'LONGTEXT',
'LONGTEXT',		'LONGTEXT',
"ENUM('0', '1')",		"ENUM('0', '1')",
		'VARCHAR(40)',
),		),
array(		array(
false,		false,
false,		false,
false,		false,
false,		false,
false,		false,
false,		false,
false,		false,
false,		false,
false,		false,
false,		false,
false,		false,
false,		false,
false,		false,
false,		false,
false,		false,
false,		false,
		false,
false		false
),		),
array(		array(
false,		false,
false,		false,
false,		false,
false,		false,
false,		false,
'CURRENT_TIMESTAMP',		'CURRENT_TIMESTAMP',
false,		false,
false,		false,
false,		false,
false,		false,
false,		false,
false,		false,
'0',		'0',
false,		false,
false,		false,
false,		false,
'0'		'0',
		false,
),		),
array(		array(
'lsID',		'lsID',
array(		array(
'lsAddress',		'lsAddress',
'lsPort'		'lsPort'
),		),
'lsName'		'lsName'
),		),
'MyISAM',		'MyISAM',
'utf8',		'utf8',
'lsID',		'lsID',
'lsID'		'lsID'
);		);
return self::$DB->query($sql);		// return self::$DB->query($sql);
		if (!self::$DB->query($sql)) {
		return false;
		} else {
		$sql = sprintf(
		"INSERT INTO `%s`"
		. " (settingKey,settingDesc,settingValue,settingCategory)"
		. " VALUES"
		. " ('FOG_USER_FILTER','Insert the uType codes comma separated.
		If you want to list all users, empty the textbox', '990,991','Plugin: LDAP'),"
		. " ('LDAP_PORTS','Insert the different ports comma separated.',
		'389,686','Plugin: LDAP')",
		'globalSettings'
		);
		return self::$DB->query($sql);
		}
}		}
/**		/**
* Uninstalls the plugin		* Uninstalls the plugin
*		*
* @return bool		* @return bool
*/		*/
public function uninstall()		public function uninstall()
{		{
$userIDs = self::getSubObjectIDs(		$userIDs = self::getSubObjectIDs(
'User',		'User',
array('type' => array(990, 991))		array('type' => array(990, 991))
);		);
if (count($userIDs) > 0) {		if (count($userIDs) > 0) {
self::getClass('UserManager')		self::getClass('UserManager')
->destroy(array('id' => $userIDs));		->destroy(array('id' => $userIDs));
}		}
return parent::uninstall();
		$sql = "DELETE FROM globalSettings where globalSettings.settingCategory
		= 'Plugin: LDAP'";
		if (!self::$DB->query($sql)) {
		return false;
		} else {
		return parent::uninstall();
		}
}		}
}		}
End of changes. 6 change blocks.
4 lines changed or deleted		30 lines changed or added

---