X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=htdocs%2Ftoplevel%2Foptions_expert.php;fp=htdocs%2Ftoplevel%2Foptions_expert.php;h=e3ff5c731b06414fb579688412584e37a12bb3e5;hb=cb8988c6b523263a756aa516ed5af09826f67783;hp=cd46dc8439ba0a421dcbf445107daf431594b941;hpb=22e6ed21411ae161f270237157f67e0c4e6c6ef4;p=diogenes.git diff --git a/htdocs/toplevel/options_expert.php b/htdocs/toplevel/options_expert.php index cd46dc8..e3ff5c7 100644 --- 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;