[evolvis-commits] r10243: massive modding of scmsvn plugin↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 17:40:56 CET 2011


Author: mirabilos
Date: 2011-02-24 17:40:56 +0100 (Thu, 24 Feb 2011)
New Revision: 10243

Added:
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/plugins/
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/plugins/scmsvn/
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/plugins/scmsvn/config.php
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/plugins/scmsvn/config.pl
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/plugins/scmsvn/httpd.conf
Removed:
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/config.php
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/config.pl
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/httpd.conf
Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/include/SVNPlugin.class
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/lib/scmsvn-init.sql
Log:
massive modding of scmsvn plugin


Deleted: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/config.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/config.php	2011-02-24 16:40:54 UTC (rev 10242)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/config.php	2011-02-24 16:40:56 UTC (rev 10243)
@@ -1,12 +0,0 @@
-<?php
- 
-$default_svn_server = $GLOBALS['sys_default_domain'] ;
-// $default_svn_server = "svn." . $GLOBALS['sys_default_domain'] ;
-$enabled_by_default = 0 ;
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
- 
-?>

Deleted: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/config.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/config.pl	2011-02-24 16:40:54 UTC (rev 10242)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/config.pl	2011-02-24 16:40:56 UTC (rev 10243)
@@ -1,4 +0,0 @@
-$this_server = $sys_default_domain ;
-# $this_server = "svn." . $sys_default_domain ;
-
-1 ;

Deleted: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/httpd.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/httpd.conf	2011-02-24 16:40:54 UTC (rev 10242)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/httpd.conf	2011-02-24 16:40:56 UTC (rev 10243)
@@ -1,15 +0,0 @@
-#
-# SVN host
-#
-<VirtualHost {ip_address}:80>
-  ServerName svn.{domain_name}
-  DocumentRoot {usr_share_gforge}/svn
-  ScriptAlias /plugins/scmsvn/cgi-bin /usr/lib/gforge/plugins/scmsvn/cgi-bin
-  Alias /images/ {usr_share_gforge}/www/images/
-  LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
-  CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/gforge.log" gforge
-  # Ensure that we don't try to use SSL on SSL Servers
-  <IfModule apache_ssl.c>
-    SSLDisable
-  </IfModule>
-</VirtualHost>

Added: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/plugins/scmsvn/config.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/plugins/scmsvn/config.php	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/plugins/scmsvn/config.php	2011-02-24 16:40:56 UTC (rev 10243)
@@ -0,0 +1,16 @@
+<?php
+ 
+//$default_svn_server = $GLOBALS['sys_default_domain'] ;
+$default_svn_server = "svn." . $GLOBALS['sys_default_domain'] ;
+$use_ssh = false;
+$use_dav = true;
+$use_ssl = true;
+$svn_root = 'svn';
+$enabled_by_default = 0 ;
+
+// Local Variables:
+// mode: php
+// c-file-style: "bsd"
+// End:
+ 
+?>

Added: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/plugins/scmsvn/config.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/plugins/scmsvn/config.pl	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/plugins/scmsvn/config.pl	2011-02-24 16:40:56 UTC (rev 10243)
@@ -0,0 +1,4 @@
+$this_server = $sys_default_domain ;
+# $this_server = "svn." . $sys_default_domain ;
+
+1 ;

Added: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/plugins/scmsvn/httpd.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/plugins/scmsvn/httpd.conf	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/etc/plugins/scmsvn/httpd.conf	2011-02-24 16:40:56 UTC (rev 10243)
@@ -0,0 +1,15 @@
+#
+# SVN host
+#
+<VirtualHost {ip_address}:80>
+  ServerName svn.{domain_name}
+  DocumentRoot {usr_share_gforge}/svn
+  ScriptAlias /plugins/scmsvn/cgi-bin /usr/lib/gforge/plugins/scmsvn/cgi-bin
+  Alias /images/ {usr_share_gforge}/www/images/
+  LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
+  CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/gforge.log" gforge
+  # Ensure that we don't try to use SSL on SSL Servers
+  <IfModule apache_ssl.c>
+    SSLDisable
+  </IfModule>
+</VirtualHost>

Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/include/SVNPlugin.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/include/SVNPlugin.class	2011-02-24 16:40:54 UTC (rev 10242)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/include/SVNPlugin.class	2011-02-24 16:40:56 UTC (rev 10243)
@@ -40,8 +40,11 @@
 		require_once('/etc/gforge/plugins/scmsvn/config.php') ;
 		
 		$this->default_svn_server = $default_svn_server ;
-		$this->this_server = $this_server ;
 		$this->enabled_by_default = $enabled_by_default ;
+		$this->use_ssh = $use_ssh;
+		$this->use_dav = $use_dav;
+		$this->use_ssl = $use_ssl;
+		$this->svn_root = $svn_root;
 
 		$this->register () ;
 	}
@@ -54,6 +57,7 @@
 			$group_id = $params['group_id'] ;
 			$this->display_scm_page ($group_id) ;
 			break ;
+/*
 		case "scm_admin_update":
 			$this->scm_admin_update ($params) ;
 			break ;
@@ -63,6 +67,7 @@
 		case "scm_stats":
 			$this->display_stats ($params) ;
 			break;
+*/
 		case "group_approved":
 			$this->group_approved ($params) ;
 			break;
@@ -79,7 +84,12 @@
 		global $Language, $HTML ;
 
 		$project =& group_get_object($group_id);
-		
+		if (!$project || !is_object($project)) {
+			return false;
+		} elseif ($project->isError()) {
+			return false;
+		}
+
 		if ($project->usesPlugin ("scmsvn")) {
 			
 // ************************************************
@@ -89,11 +99,6 @@
 								</p>' ;
 
 
-			if($this->svn_single_host) {
-				$svnrootend=$this->default_svn_host.':/svnroot/'.$project->getUnixName();
-			} else {
-				$svnrootend='svn.'.$project->getUnixName().'.'.$this->default_svn_host.':/svnroot/'.$project->getUnixName();
-			}
 // ######################## table for summary info
 
 ?>
@@ -103,28 +108,34 @@
 <?php
 // ######################## anonymous SVN instructions
 
-	 if ($this->UsesAnonSVN ($group_id)) {
-		 // echo $Language->getText('scm_index', 'anoncvs');
-		 print "<b>Anonymous Subversion Access</b>
-						<p>
-						<tt>svn checkout svn://" . $this->GetGroupServer($group_id) . "/".$project->getUnixName()."</tt>
-								</p>" ;
-	 }
+	if ($project->enableAnonSCM()) {
+		// echo $Language->getText('scm_index', 'anoncvs');
+		print "<b>Anonymous Subversion Access</b>
+						<p>";
+		if ($this->use_ssh) {
+			print "<tt>svn checkout svn://" . $project->getSCMBox(). "/". $this->svn_root ."/". $project->getUnixName() ."</tt>";
+		}
+		if ($this->use_dav) {
+			print "<tt>http".(($this->use_ssl) : 's' ? '')."://" . $project->getSCMBox(). "/". $this->svn_root ."/". $project->getUnixName() ."</tt>";
+		}
+		print "</p>";
+	}
 
 // ############################ developer access
-			
-	 // echo $Language->getText('scm_index', 'devcvs');
-	 echo "<b>Developer Subversion Access via SSH</b>" ;
 
-	 print "<p>
-	 <tt>svn checkout svn+ssh://<i>developername</i>@" . $this->GetGroupServer($group_id) . "/var/lib/gforge/chroot/svnroot/".$project->getUnixName()."</tt>
-</p>" ;
+	if ($this->use_ssh) {
+		// echo $Language->getText('scm_index', 'devcvs');
+		print "<b>Developer Subversion Access via SSH</b>" ;
 
-	 echo "<b>Developer Subversion Access via DAV</b>" ;
+		print "<p>
+		<tt>svn checkout svn+ssh://<i>developername</i>@" . $project->getSCMBox() . "/". $this->svn_root ."/". $project->getUnixName()."</tt></p>" ;
+	}
+	if ($this->use_dav) {
+		print "<b>Developer Subversion Access via DAV</b>" ;
 
-	 print "<p>
-	 <tt>svn checkout --username <i>developername</i> http://" . $this->GetGroupServer($group_id) . "/groups/".$project->getUnixName()."</tt>
-</p>" ;
+		print "<p>
+		<tt>svn checkout --username <i>developername</i> http".(($this->use_ssl) : 's' ? '')."://". $project->getSCMBox() ."/". $this->svn_root ."/".$project->getUnixName()."</tt></p>" ;
+	}
 
 // ################## summary info
 
@@ -140,10 +151,15 @@
 $anonymous = 1 ;
 if (session_loggedin()) {
    $perm =& $project->getPermission(session_get_user());
-   $anonymous = !$perm->isMember();
+	if (!$perm || !is_object($perm)) {
+		return false;
+	} elseif ($perm->isError()) {
+		return false;
+	}
+	$anonymous = !$perm->isMember();
 }
  
-if ($this->UsesAnonSVN ($group_id)) {
+if ($project->enableAnonSCM()) {
 	echo $HTML->boxTop($Language->getText('scm_index', 'history'));
 
 	// echo $Language->getText('scm_index', 'browsetree');
@@ -169,6 +185,7 @@
 
 	}
 
+/*
 	function scm_admin_update ($params) {
 		$group =& group_get_object($params['group_id']);
 
@@ -224,7 +241,7 @@
 		echo ' (SVN: '.$Language->getText('project_home','cvs_commits',array(number_format($commit_num,0),number_format($add_num,0))).")";
 		
 	}
-	
+*/	
 	function group_approved ($params) {
 		$group_id = $params['group_id'] ;
 		
@@ -241,7 +258,7 @@
 		}
 		return true;
 	}
-	
+/*
 	function GetDefaultServer () {
 		return $this->default_svn_server ;
 	}
@@ -295,7 +312,7 @@
 		$res = db_query($sql);
 		db_commit () ;
 	}
-
+*/
 }
 
 // Local Variables:

Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/lib/scmsvn-init.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/lib/scmsvn-init.sql	2011-02-24 16:40:54 UTC (rev 10242)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/lib/scmsvn-init.sql	2011-02-24 16:40:56 UTC (rev 10243)
@@ -1,25 +1,4 @@
-CREATE SEQUENCE plugin_scmsvn_grp_usage_pk_seq ;
-
-CREATE TABLE plugin_scmsvn_group_usage (
-	group_usage_id integer DEFAULT nextval('plugin_scmsvn_grp_usage_pk_seq'::text) NOT NULL,
-	group_id integer DEFAULT 0 NOT NULL,
-	svn_host text DEFAULT '' NOT NULL,
-	anon_svn integer DEFAULT 0 NOT NULL,
-	CONSTRAINT "plugin_scmsvn_group_usage_pkey" PRIMARY KEY ("group_usage_id"),
-	CONSTRAINT "plugin_scmsvn_groupusage_groupid_fkey" FOREIGN KEY (group_id) REFERENCES groups(group_id) MATCH FULL ON DELETE CASCADE
-) ;
-
-CREATE SEQUENCE plugin_scmsvn_stats_pk_seq ;
-
-CREATE TABLE plugin_scmsvn_stats (
-	stats_id integer DEFAULT nextval('plugin_scmsvn_stats_pk_seq'::text) NOT NULL,
-	group_id integer DEFAULT 0 NOT NULL,
-	last_check_date integer DEFAULT 0 NOT NULL,
-	last_repo_version integer DEFAULT 0 NOT NULL,
-	adds integer DEFAULT 0 NOT NULL,
-	deletes integer DEFAULT 0 NOT NULL,
-	commits integer DEFAULT 0 NOT NULL,
-	changes integer DEFAULT 0 NOT NULL,
-	CONSTRAINT "plugin_scmsvn_stats_pkey" PRIMARY KEY ("stats_id"),
-	CONSTRAINT "plugin_scmsvn_stats_groupid_fkey" FOREIGN KEY (group_id) REFERENCES groups(group_id) MATCH FULL ON DELETE CASCADE
-) ;
+DROP TABLE plugin_scmsvn_group_usage;
+DROP TABLE plugin_scmsvn_stats;
+DROP SEQUENCE plugin_scmsvn_grp_usage_pk_seq;
+DROP SEQUENCE plugin_scmsvn_stats_pk_seq;



More information about the evolvis-commits mailing list