rename VCS-related classes

diff --git a/htdocs/toplevel/options_expert.php b/htdocs/toplevel/options_expert.php
index cd46dc8..e3ff5c7 100644 (file)
--- a/htdocs/toplevel/options_expert.php
+++ b/htdocs/toplevel/options_expert.php
@@ -16,7 +16,7 @@ case "cvs-rcs":
   $res = $globals->db->query("select alias from diogenes_site");
   while(list($site) = mysql_fetch_row($res)) {
     $page->info("processing '$site'..");
-    $spool = new DiogenesSpool($page,$site);
+    $spool = new Diogenes_VCS_Spool($page,$site);
     $page->info("-> deleting 'CVS' subdirectories from spool..");
     $goners = System::find($spool->datadir.' -type d');
     foreach($goners as $goner) {
@@ -29,7 +29,7 @@ case "cvs-rcs":
       chmod($modfile,0444);
     }
   }
-  $globals->updateOption("rcs","DiogenesRcs");
+  $globals->updateOption("rcs","Diogenes_VCS_RCS");
   break;
 
 case "rcs-cvs":
@@ -47,9 +47,9 @@ case "rcs-cvs":
     $page->info("-> removing '{$globals->spoolroot}/$site'..");
     System::rm("-r {$globals->spoolroot}/$site");
     $page->info("-> doing a checkout of module '$site'..");
-    $spool = new DiogenesCvs($page,$site,$_SESSION['session']->username,true);
+    $spool = new Diogenes_VCS_CVS($page,$site,$_SESSION['session']->username,true);
   }
-  $globals->updateOption("rcs","DiogenesCvs");
+  $globals->updateOption("rcs","Diogenes_VCS_CVS");
   break;
 }
 
@@ -57,12 +57,12 @@ $page->assign('msg_convert',__("Convert"));
 $page->assign('msg_vcs',__("version control system"));
 
 switch ($globals->rcs) {
-case "DiogenesRcs":
+case "Diogenes_VCS_RCS":
   $page->assign('msg_current_vcs',__("You are currently using RCS as the version control system for your barrels."));
   $page->append('conversions',array("rcs-cvs", __("You can switch to a full CVS repository by clicking here.")));
   break;
 
-case "DiogenesCvs":
+case "Diogenes_VCS_CVS":
   $page->assign('msg_current_vcs',__("You are currently using CVS as the version control system for your barrels."));
   $page->append('conversions',array("cvs-rcs", __("You can switch back to RCS by clicking here.")));
   break;

diff --git a/include/Barrel.php b/include/Barrel.php
index 7eb24a5..a1ba574 100644 (file)
--- a/include/Barrel.php
+++ b/include/Barrel.php
@@ -87,7 +87,7 @@ class Diogenes_Barrel
 
     $this->flags = new flagset($flags);    
     $this->options = new Diogenes_Barrel_Options($this->alias);
-    $this->spool = new DiogenesSpool($this,$this->alias);
+    $this->spool = new Diogenes_VCS_Spool($this,$this->alias);
     
     $this->readTree();
   }

diff --git a/include/diogenes.cvs.inc.php b/include/diogenes.cvs.inc.php
index 16dcd7b..7e2a1c5 100644 (file)
--- a/include/diogenes.cvs.inc.php
+++ b/include/diogenes.cvs.inc.php
@@ -23,7 +23,7 @@ require_once 'diogenes.rcs.inc.php';
 
 /** This class handles Diogenes CVS operations.
  */
-class DiogenesCvs extends DiogenesRcs {
+class Diogenes_VCS_CVS extends Diogenes_VCS_RCS {
   /** CVS command options */
   var $cvsopt;
 
@@ -37,10 +37,10 @@ class DiogenesCvs extends DiogenesRcs {
    * @param login the current user's login
    * @param init should create this module?
    */
-  function DiogenesCvs(&$caller,$alias,$login,$init = false) {
+  function Diogenes_VCS_CVS(&$caller,$alias,$login,$init = false) {
     global $globals;
     // call parent constructor
-    $this->DiogenesRcs($caller,$alias,$login,$init);
+    $this->Diogenes_VCS_RCS($caller,$alias,$login,$init);
 
     // set CVS environment, fire up pserver
     // the pserver suicides after 5mn of inactivity

diff --git a/include/diogenes.globals.inc.php.in b/include/diogenes.globals.inc.php.in
index 0f4ec59..061608f 100644 (file)
--- a/include/diogenes.globals.inc.php.in
+++ b/include/diogenes.globals.inc.php.in
@@ -42,10 +42,10 @@ class DiogenesGlobals extends DiogenesCoreGlobals {
   /** The Word file containing a barrel page definition */
   var $wordfile = "page.doc";
 
-  /** The revision control system (DiogenesRcs or DiogenesCvs).
+  /** The revision control system (Diogenes_VCS_RCS or Diogenes_VCS_RCS).
    *  This can be set from the toplevel interface
    */
-  var $rcs = "DiogenesRcs";
+  var $rcs = "Diogenes_VCS_RCS";
   /** The class for display toplevel pages. */
   var $toplevel = 'DiogenesToplevel';
   /** The class for displaying sites. */

diff --git a/include/diogenes.rcs.inc.php b/include/diogenes.rcs.inc.php
index 090d6b5..0846b93 100644 (file)
--- a/include/diogenes.rcs.inc.php
+++ b/include/diogenes.rcs.inc.php
@@ -26,7 +26,7 @@ require_once 'System.php';
 
 /** This class handles Diogenes RCS operations.
  */
-class DiogenesRcs extends DiogenesSpool {
+class Diogenes_VCS_RCS extends Diogenes_VCS_Spool {
   /** Absolute directory location for the barrel's RCS files. */
   var $rcsdir;
 
@@ -39,9 +39,9 @@ class DiogenesRcs extends DiogenesSpool {
    * @param login the current user's login
    * @param init should create this module?
    */
-  function DiogenesRcs(&$caller,$alias,$login,$init = false) {
+  function Diogenes_VCS_RCS(&$caller,$alias,$login,$init = false) {
     global $globals;
-    $this->DiogenesSpool($caller,$alias);
+    $this->Diogenes_VCS_Spool($caller,$alias);
     $this->rcsdir = "{$globals->rcsroot}/$alias";
     $this->login = $login;
 

diff --git a/include/diogenes.spool.inc.php b/include/diogenes.spool.inc.php
index b28e403..6afa6e2 100644 (file)
--- a/include/diogenes.spool.inc.php
+++ b/include/diogenes.spool.inc.php
@@ -21,7 +21,7 @@
 
 /** This class handles Diogenes spool operations.
  */
-class DiogenesSpool {
+class Diogenes_VCS_Spool {
   /** The barrel we are running on */
   var $alias;
   /** Absolute directory location for the barrel's spool. */
@@ -47,7 +47,7 @@ class DiogenesSpool {
    * @param caller the caller
    * @param alias the alias to work on
    */
-  function DiogenesSpool(&$caller,$alias) {
+  function Diogenes_VCS_Spool(&$caller,$alias) {
     global $globals;
     $this->datadir = "{$globals->spoolroot}/$alias";
     $this->caller =& $caller;

diff --git a/include/diogenes.webdav.inc.php b/include/diogenes.webdav.inc.php
index 4a47854..8cf8bdd 100644 (file)
--- a/include/diogenes.webdav.inc.php
+++ b/include/diogenes.webdav.inc.php
@@ -297,7 +297,7 @@ class DiogenesWebDAV extends HTTP_WebDAV_Server
    *
    * @param msg
    *
-   * @see DiogenesRcs
+   * @see Diogenes_VCS_RCS
    */
   function info($msg) {
     // we do nothing
@@ -309,7 +309,7 @@ class DiogenesWebDAV extends HTTP_WebDAV_Server
    *
    * @param msg
    *
-   * @see DiogenesRcs
+   * @see Diogenes_VCS_RCS
    */
   function kill($msg) {
     $this->http_status("400 Error");
@@ -323,7 +323,7 @@ class DiogenesWebDAV extends HTTP_WebDAV_Server
    * @param action
    * @param data
    *
-   * @see DiogenesRcs
+   * @see Diogenes_VCS_RCS
    */
   function log($action,$data) {
     if (isset($_SESSION['log']) && is_object($_SESSION['log']))