Put every plugin class into its own FOG\Plugins\<Plugin> namespace

capone/class/capone.class.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Capone;
+
 /**
  * Handles the database for Capone plugin
  *

capone/class/caponemanager.class.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Capone;
+
 /**
  * Manager class for Capone
  *

capone/hooks/addbootmenuitem.hook.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Capone;
+
 /**
  * Creates the capone menu item.
  *

capone/hooks/addcaponeapi.hook.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Capone;
+
 /**
  * Injects capone stuff into the api system.
  *

capone/hooks/addcaponejs.hook.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Capone;
+
 /**
  * Sets the javascript files up for this plugin.
  *

capone/hooks/addcaponemenuitem.hook.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Capone;
+
 /**
  * Adds the capone menu item.
  *

capone/pages/caponemanagement.page.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Capone;
+
 /**
  * The capone page.
  *

capone/reg-task/caponetasking.class.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Capone;
+
 /**
  * This is only used for capone plugin.
  *

helloworld/class/helloworld.class.php

@@ -7,9 +7,12 @@
  * get('name') / set('name', ...) / save() / load() / destroy(), and
  * instantiate with an id (new HelloWorld(42)) to auto-load.
  *
- * NOTE: the autoloader uses PHP's default spl_autoload, which lowercases the
- * class name to find the file. So class HelloWorld must live in the file
- * helloworld.class.php.
+ * NOTE: FOG's own autoloader, Initiator::autoload(), resolves the class --
+ * there is no spl_autoload fallback (fogproject ADR 0013 §2b removed it, since
+ * it let a plugin shadow a core class by filename). The filename still has to
+ * match the class name (case-insensitively), because that match is how
+ * Initiator finds the file. So class HelloWorld must live in the file
+ * helloworld.class.php, and declares namespace FOG\Plugins\Helloworld.
  *
  * PHP version 5
  *
@@ -19,6 +22,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Helloworld;
+
 /**
  * Hello World example plugin (model).
  *

helloworld/class/helloworldmanager.class.php

@@ -19,6 +19,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Helloworld;
+
 /**
  * Hello World example plugin (manager).
  *

helloworld/hooks/addhelloworldapi.hook.php

@@ -14,6 +14,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Helloworld;
+
 /**
  * Injects Hello World into the API system.
  *

helloworld/hooks/addhelloworldjs.hook.php

@@ -14,6 +14,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Helloworld;
+
 /**
  * Injects the Hello World JS files.
  *

helloworld/hooks/addhelloworldmenuitem.hook.php

@@ -15,6 +15,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Helloworld;
+
 /**
  * Adds the Hello World menu item.
  *

helloworld/pages/helloworldmanagement.page.php

@@ -21,6 +21,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Helloworld;
+
 /**
  * Hello World example plugin (management page).
  *

helloworld/tasks/helloworldheartbeat.task.php

@@ -34,6 +34,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Helloworld;
+
 /**
  * Counts this plugin's rows on a schedule and writes the number to the log.
  *

ldap/class/ldap.class.php

@@ -12,6 +12,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * LDAP Authentication plugin
  *

ldap/class/ldapgroup.class.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * A directory group this server is willing to recognise.
  *

ldap/class/ldapgroupmanager.class.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * Manager for the LDAPGroups table.
  *

ldap/class/ldapgrouproleassociation.class.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * Association between a directory group and a FOG role.
  *

ldap/class/ldapgrouproleassociationmanager.class.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * Manager for the ldapGroupRoleAssoc table.
  *

ldap/class/ldapgroupusergroupassociation.class.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * Association between a directory group and a FOG user group.
  *

ldap/class/ldapgroupusergroupassociationmanager.class.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * Manager for the ldapGroupUserGroupAssoc table.
  *

ldap/class/ldapmanager.class.php

@@ -12,6 +12,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * LDAPManager
  *

ldap/class/ldapusergrant.class.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * A record of one role or user group this plugin granted to one user.
  *

ldap/class/ldapusergrantmanager.class.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * Manager for the ldapUserGrant table.
  *

ldap/hooks/addldapapi.hook.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * Injects LDAP stuff into the api system.
  *

ldap/hooks/addldapgrouptabs.hook.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * Associates directory groups from the role and user group pages.
  *

ldap/hooks/addldapjs.hook.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * Sets the javascript files up for this plugin.
  *

ldap/hooks/addldapmenuitem.hook.php

@@ -12,6 +12,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * Adds the menu item for this plugin
  *

ldap/hooks/addldaptype.hook.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * Adds the ldap type to the reports/exports items
  *

ldap/hooks/ldapdeletemassitems.hook.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * Deletes the LDAP plugin elements en-mass.
  *

ldap/hooks/ldappluginhook.hook.php

@@ -12,6 +12,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * LDAPPluginHook enables our checks as required
  *

ldap/pages/ldapgroupmanagement.page.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * The LDAP group management page
  *

ldap/pages/ldapmanagement.page.php

@@ -12,6 +12,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * The ldap management page
  *

ldap/reports/ldap_report.report.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Ldap;
+
 /**
  * LDAP report.
  *

location/class/location.class.php

@@ -11,6 +11,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Location;
+
 /**
  * The location class.
  *

location/class/locationassociation.class.php

@@ -10,6 +10,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Location;
+
 /**
  * The association between hosts and locations.
  *

location/class/locationassociationmanager.class.php

@@ -11,6 +11,9 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
+
+namespace FOG\Plugins\Location;
+
 /**
  * Location association manager class.
  *