[evolvis-commits] r11125: my-docman-pm-reporting-account-stats↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 18:03:11 CET 2011


Author: mirabilos
Date: 2011-02-24 18:03:11 +0100 (Thu, 24 Feb 2011)
New Revision: 11125

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/common/docman/DocumentGroupFactory.class
   trunk/gforge_base/evolvisforge-5.1/gforge/www/account/change_email-complete.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/account/lostlogin.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/account/setlang.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/account/unsubscribe.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/admin/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/include/doc_utils.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/new.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/my/bookmark_add.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/my/bookmark_edit.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/admin/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/task.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/uploadcsv.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/projectact_graph.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/rebuild.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/soap/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/stats/projects.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/stats/views_graph.php
Log:
my-docman-pm-reporting-account-stats


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/docman/DocumentGroupFactory.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/docman/DocumentGroupFactory.class	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/docman/DocumentGroupFactory.class	2011-02-24 17:03:11 UTC (rev 11125)
@@ -100,10 +100,44 @@
 		$count = count($this->flat_groups);
 		for ($i=0; $i < $count; $i++) {
 			$this->nested_groups["".$this->flat_groups[$i]->getParentID()][] =& $this->flat_groups[$i];
+			
 		}
+
 		
 		return $this->nested_groups;
+
 	}
+		/**
+	 *	getDocumentGroups - Return an array of DocumentGroup objects.
+	 *
+	 *	@return	array	The array of DocumentGroup.
+	 */
+	function &getDocumentGroups() {
+		if ($this->flat_groups) {
+			return $this->flat_groups;
+		}
+		
+		$sql="SELECT * FROM doc_groups
+		WHERE group_id='".$this->Group->getID()."' 
+		ORDER BY groupname ASC";
+
+		$result=db_query($sql);
+		$rows = db_numrows($result);
+		
+		if (!$result || $rows < 1) {
+			$this->setError('No Groups Found '.db_error());
+			return false;
+		} else {
+			while ($arr = db_fetch_array($result)) {
+				$this->flat_groups[] = new DocumentGroup($this->Group, $arr);
+			}
+		}
+		
+
+		
+		return $this->flat_groups;
+
+	}
 }
 
 ?>

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/account/change_email-complete.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/account/change_email-complete.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/account/change_email-complete.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -32,7 +32,8 @@
 
 if (!$confirm_hash) {
 	// XXX ogi: What's $ch?
-	$confirm_hash = $ch;
+	//$confirm_hash = $ch;
+	$confirm_hash = getStringFromRequest('ch');
 }
 if (!$confirm_hash) {
 	exit_missing_param();

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/account/lostlogin.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/account/lostlogin.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/account/lostlogin.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -34,7 +34,7 @@
 
 if (!$confirm_hash) {
 	// XXX ogi: What's $ch?
-	$confirm_hash = $ch;
+	$confirm_hash = getStringFromRequest('ch');
 }
 if (!$confirm_hash) {
 	exit_missing_param();

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/account/setlang.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/account/setlang.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/account/setlang.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -25,6 +25,7 @@
 
 require_once('pre.php');
 
+$language_id=getStringFromRequest('language_id');
 setcookie('cookie_language_id',$language_id,(time()+2592000),'/','',0);
 $cookie_language_id = $language_id;
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/account/unsubscribe.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/account/unsubscribe.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/account/unsubscribe.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -32,7 +32,7 @@
 
 if (!$confirm_hash) {
 	// XXX ogi: What's $ch?
-	$confirm_hash = $ch;
+	$confirm_hash = getStringFromRequest('ch');
 }
 if (!$confirm_hash) {
 	exit_missing_param();
@@ -56,6 +56,7 @@
     exit_error('Error',$u->getErrorMessage());
 }
 
+$all=getStringFromRequest('all');
 $user->unsubscribeFromMailings($all);
 
 site_header(array('title'=>"Unsubscription Complete"));

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/admin/index.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/admin/index.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -92,14 +92,14 @@
 
 	} elseif (getStringFromRequest('editgroup')) {
 		$doc_group = getStringFromRequest('doc_group');
-		$groupname = $groupname;
+		$groupname = getIntFromRequest('groupname');
 		$parent_doc_group = getIntFromRequest('parent_doc_group');
-
+		
 		$dg = new DocumentGroup($g,$doc_group);
 		if ($dg->isError()) {
 			exit_error('Error',$dg->getErrorMessage());
 		}
-		if (!$dg->update($groupname,$parent_doc_group)) {
+		if (!$dg->update($groupname,$parent_doc_group)) {			
 			exit_error('Error',$dg->getErrorMessage());
 		}
 		$feedback = $Language->getText('general','update_successful');
@@ -275,7 +275,7 @@
 //	Add a document group / view existing groups list
 //
 //
-} elseif ($addgroup) {
+} elseif (getStringFromRequest('addgroup')) {
 
 	docman_header($Language->getText('docman_admin_addgroups','section'),$Language->getText('docman_admin_addgroups','title'),'');
 
@@ -341,7 +341,7 @@
 //
 } elseif (getStringFromRequest('editgroup') && getStringFromRequest('doc_group')) {
 	$doc_group = getStringFromRequest('doc_group');
-
+	
 	$dg = new DocumentGroup($g,$doc_group);
 	if ($dg->isError()) {
 		exit_error('Error',$dg->getErrorMessage());
@@ -427,7 +427,7 @@
 	$df->setStateID('ALL');
 //	$df->setSort('stateid');
 	$d_arr =& $df->getDocuments();
-
+	
 	docman_header($Language->getText('docman_admin','section', $g->getPublicName()),$Language->getText('docman_admin','title'),'admin');
 
 	?> 
@@ -440,13 +440,13 @@
 	if (!$d_arr || count($d_arr) < 1) {
 		print "<p><strong>".$Language->getText('docman','error_no_docs').".</strong></p>";
 	} else {
-		// get a list of used document states
+		// get a list of used document states		
 		$states = $df->getUsedStates();
 		$nested_groups =& $dgf->getNested();
 		echo "<ul>";
 		foreach ($states as $state) {
 			echo "<li><strong>".$state["name"]."</strong>";
-			docman_display_documents($nested_groups, $df, true, $state["stateid"], true);
+			docman_display_documents($nested_groups, $df, true, $state[$stateid], true);
 			echo "</li>";
 		}
 		echo "</ul>";

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/include/doc_utils.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/include/doc_utils.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/include/doc_utils.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -153,6 +153,11 @@
 function docman_display_documents(&$nested_groups, &$document_factory, $is_editor, $stateid=0, $from_admin=false, $parent_group=0) {
 	global $selected_doc_group_id,$Language;
 
+	$selected_doc_group_id=getIntFromRequest('selected_doc_group_id');
+	
+	
+
+	
 	if (!is_array($nested_groups["$parent_group"])) {
 		return;
 	}
@@ -160,12 +165,12 @@
 	echo "<ul style='list-style-type: none'>";
 	$child_count = count($nested_groups["$parent_group"]);
 	
-	for ($i=0; $i < $child_count; $i++) {
+	for ($i=0; $i < $child_count; $i++) {		
 		$doc_group =& $nested_groups["$parent_group"][$i];
 		
 		// Display group and subgroups only if it has associated documents
 		if ($doc_group->hasDocuments($nested_groups, $document_factory, $stateid)) {
-			// Recursive call
+			// Recursive call			
 			if (($doc_group->getID() == $selected_doc_group_id || $doc_group->hasSubgroup($nested_groups, $selected_doc_group_id)) && (!$stateid || $stateid == $GLOBALS['selected_stateid'])) {
 				$icon = 'ofolder15.png';
 			} else {
@@ -190,7 +195,7 @@
 		
 		// Display this group's documents
 		if (($doc_group->hasSubgroup($nested_groups, $selected_doc_group_id) || $selected_doc_group_id == $doc_group->getID()) && (!$stateid || $stateid == $GLOBALS['selected_stateid'])) {
-			// Retrieve all the docs from this category
+			// Retrieve all the docs from this category			
 			if ($stateid) {
 				$document_factory->setStateID($stateid);
 			}

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/index.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/index.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -85,7 +85,7 @@
 	doc_droplist_count($group_id, $language_id, $g);
 
 	// Get the document groups info
-	$nested_groups =& $dgf->getNested();
+	$nested_groups =& $dgf->getNested();	
 	docman_display_documents($nested_groups,$df,$is_editor);
 }
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/new.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/new.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/new.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -18,6 +18,7 @@
 */
 
 
+
 require_once('pre.php');
 require_once('common/docman/Document.class');
 require_once('common/docman/DocumentGroupFactory.class');
@@ -26,13 +27,13 @@
 
 $group_id = getIntFromRequest('group_id');
 if (!$group_id) {
-	exit_no_group();
+	exit_no_group();	
 }
 $g =& group_get_object($group_id);
 if (!$g || !is_object($g)) {
-	exit_error('Error','Could Not Get Group');
+	exit_error('Error','Could Not Get Group');	
 } elseif ($g->isError()) {
-	exit_error('Error',$g->getErrorMessage());
+	exit_error('Error',$g->getErrorMessage());	
 }
 
 $upload_dir = $sys_ftp_upload_dir . "/" . $g->getUnixName();
@@ -45,43 +46,45 @@
 	$ftp_filename = getStringFromRequest('ftp_filename');
 	$uploaded_data = getUploadedFile('uploaded_data');
 	$language_id = getIntFromRequest('language_id');
+	
 
 	if (!$doc_group || $doc_group == 100) {
-		//cannot add a doc unless an appropriate group is provided
+		//cannot add a doc unless an appropriate group is provided		
 		exit_error($Language->getText('general','error'),$Language->getText('docman_new','no_valid_group'));
 	}
-
-	if (!$title || !$description || (!$uploaded_data && !$file_url && !$ftp_filename )) {
+	
+	if (!$title || !$description || (!$uploaded_data && !$file_url && !$ftp_filename )) {		
 		exit_missing_param();
 	}
 
 	$d = new Document($g);
-	if (!$d || !is_object($d)) {
+	if (!$d || !is_object($d)) {		
 		exit_error($Language->getText('general','error'),$Language->getText('docman_new','error_blank_document'));
-	} elseif ($d->isError()) {
+	} elseif ($d->isError()) {	
 		exit_error($Language->getText('general','error'),$d->getErrorMessage());
 	}
-
-	if ($uploaded_data) {
-		if (!is_uploaded_file($uploaded_data['tmp_name'])) {
+	
+	if ($file_url) {
+		$data = '';
+		$uploaded_data_name=$file_url;
+		$uploaded_data_type='URL';		
+	} elseif ($ftp_filename!=100) { //100 == None
+		$uploaded_data_name=$upload_dir.'/'.$ftp_filename;
+		$data = addslashes(fread(fopen($uploaded_data_name, 'r'), filesize($uploaded_data_name)));
+	} elseif ($uploaded_data) {
+		if (!is_uploaded_file($uploaded_data['tmp_name'])) {			
 			exit_error($Language->getText('general','error'),$Language->getText('general','invalid_filename'));
 		}
 		$data = addslashes(fread(fopen($uploaded_data['tmp_name'], 'r'), $uploaded_data['size']));
 		$file_url='';
 		$uploaded_data_name=$uploaded_data['name'];
 		$uploaded_data_type=$uploaded_data['type'];
-	} elseif ($file_url) {
-		$data = '';
-		$uploaded_data_name=$file_url;
-		$uploaded_data_type='URL';
-	} elseif ($ftp_filename) {
-		$uploaded_data_name=$upload_dir.'/'.$ftp_filename;
-		$data = addslashes(fread(fopen($uploaded_data_name, 'r'), filesize($uploaded_data_name)));
 	}
 	
+	
 	if (!$d->create($uploaded_data_name,$uploaded_data_type,$data,$doc_group,$title,$language_id,$description)) {
-		exit_error($Language->getText('general','error'),$d->getErrorMessage());
-	} else {
+			exit_error($Language->getText('general','error'),$d->getErrorMessage());
+	} else {		
 		Header("Location: /docman/?group_id=$group_id&feedback=".$Language->getText('docman_new','submitted_successfully'));
 		exit;
 	}
@@ -155,6 +158,7 @@
 			}
 
 			//display_groups_option($group_id);
+			$selected_doc_group=getIntFromRequest('selected_doc_group');
 			$dgh->showSelectNestedGroups($dgf->getNested(), 'doc_group', false, $selected_doc_group);
 		?>
 		</td>

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/index.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/index.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -25,6 +25,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+
 require_once('pre.php');    // Initial db and session library, opens session
 require_once('www/news/news_utils.php');
 require_once('common/forum/Forum.class');

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/my/bookmark_add.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/my/bookmark_add.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/my/bookmark_add.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -49,7 +49,7 @@
 	<p><?php echo $Language->getText('my_bookmark_add','bookmark_title') ?>:<br />
 	<input type="text" name="bookmark_title" value="" />
 	</p>
-	<p><input type="submit" value="<?php echo $Language->getText('general','submit') ?>" /></p>
+	<p><input type="submit" name="submit" value="<?php echo $Language->getText('general','submit') ?>" /></p>
 	</form>
 	<?php
 }

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/my/bookmark_edit.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/my/bookmark_edit.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/my/bookmark_edit.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -60,7 +60,7 @@
 <p><?php echo $Language->getText('my_bookmark_add','bookmark_title') ?>:<br />
 <input type="text" name="bookmark_title" value="<?php echo $bookmark_title; ?>" />
 </p>
-<p><input type="submit" value=" <?php echo $Language->getText('general','submit') ?> " /></p>
+<p><input type="submit" name="submit" value=" <?php echo $Language->getText('general','submit') ?> " /></p>
 </form>
 <?php
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/admin/index.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/admin/index.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -144,6 +144,7 @@
 		$sure = getStringFromRequest('sure');
 		$really_sure = getStringFromRequest('really_sure');
 
+	
 		/*
 			Delete a subproject
 		*/

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/task.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/task.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/task.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -49,6 +49,8 @@
 $duration = getStringFromRequest('duration');
 $parent_id = getIntFromRequest('parent_id');
 
+
+
 if (!$group_id || !$group_project_id) {
 	exit_missing_param();
 }
@@ -95,8 +97,9 @@
 	//
 	case 'postaddtask' : {
 		if ($pg->userIsAdmin()) {
+			
 			$add_artifact_id = getStringFromRequest('add_artifact_id');
-
+						
 			$pt = new ProjectTask($pg);
 			if (!$pt || !is_object($pt)) {
 				exit_error('Error','Could Not Get Empty ProjectTask');
@@ -104,9 +107,14 @@
 				exit_error('Error',$pt->getErrorMessage());
 			}
 
+			if (!$dependent_on)
+			{
+				$dependent_on=array();
+			}
 			$start_date=mktime($start_hour,$start_minute,0,$start_month,$start_day,$start_year);
 			$end_date=mktime($end_hour,$end_minute,0,$end_month,$end_day,$end_year);
-
+			
+			
 			if (!$pt->create($summary,$details,$priority,$hours,$start_date,$end_date,$category_id,$percent_complete,$assigned_to,$pt->convertDependentOn($dependent_on),$duration,$parent_id)) {
 				exit_error('ERROR',$pt->getErrorMessage());
 			} else {
@@ -130,7 +138,11 @@
 	case 'postmodtask' : {
 		if ($pg->userIsAdmin()) {
 			$rem_artifact_id = getStringFromRequest('rem_artifact_id');
-
+		
+			if(!$rem_artifact_id){
+				$rem_artifact_id=array();
+			}
+		
 			$pt = new ProjectTask($pg,$project_task_id);
 			if (!$pt || !is_object($pt)) {
 				exit_error('Error','Could Not Get ProjectTask');
@@ -138,6 +150,9 @@
 				exit_error('Error',$pt->getErrorMessage());
 			}
 
+			if (!$dependent_on)	{
+				$dependent_on=array();
+			}
 			$start_date=mktime($start_hour,$start_minute,0,$start_month,$start_day,$start_year);
 			$end_date=mktime($end_hour,$end_minute,0,$end_month,$end_day,$end_year);
 			if (!$pt->update($summary,$details,$priority,$hours,$start_date,$end_date,
@@ -182,7 +197,7 @@
 
 	case 'postuploadcsv': {
 
-		if ($pg->userIsAdmin()) {
+		if ($pg->userIsAdmin()) {			
 			include 'postuploadcsv.php';
 		} else {
 			exit_permission_denied();
@@ -193,7 +208,7 @@
 	case 'massupdate' : {
 		$project_task_id_list = getStringFromRequest('project_task_id_list');
 		$count=count($project_task_id_list);
-
+	
 		if ($pg->userIsAdmin()) {
 
 			for ($i=0; $i < $count; $i++) {

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/uploadcsv.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/uploadcsv.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/uploadcsv.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -11,7 +11,7 @@
 ?>
 <?php echo $Language->getText('pm_uploadcsv','explain'); ?>
 <p>
-<form enctype="multipart/form-data" method="post" action="<?php echo getStringFromServer('PHP_SELF')?>?group_project_id=$group_project_id&group_id=$group_id&func=postuploadcsv">
+<form enctype="multipart/form-data" method="post" action="<?php echo getStringFromServer('PHP_SELF')?>?group_project_id=<? echo $group_project_id ?>&group_id=<? echo $group_id ?>&func=postuploadcsv">
 <?php echo $Language->getText('pm_uploadcsv','choose_file'); ?><br />
 <input type="file" name="userfile"  size="30" />
 <input type="submit" name="submit" value="submit">

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/projectact_graph.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/projectact_graph.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/projectact_graph.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -30,12 +30,14 @@
 require_once($sys_path_to_jpgraph.'/jpgraph_line.php');
 require_once('common/reporting/ReportProjectAct.class');
 
-$SPAN = getStringFromRequest("SPAN");
-$area = getStringFromRequest("area");
-$g_id = getStringFromRequest("g_id");
-$start = getStringFromRequest("start");
-$end = getStringFromRequest("end");
 
+$area = getStringFromRequest('area');
+$SPAN = getStringFromRequest('SPAN');
+$start = getStringFromRequest('start');
+$end = getStringFromRequest('end');
+$g_id = getStringFromRequest('g_id');
+
+
 if (!$SPAN) {
 	$SPAN=1;
 }

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/rebuild.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/rebuild.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/rebuild.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -34,22 +34,27 @@
 
 global $Language;
 
-echo report_header($Language->getText('reporting_rebuild','title'));
-
+	echo report_header($Language->getText('reporting_rebuild','title'));
 if (getStringFromRequest('submit') && getStringFromRequest('im_sure')) {
+		
 
+
 	$r = new ReportSetup();
 
 	if (!$r->initialSetup()) {
 		echo $r->getErrorMessage();
+		form_release_key(getStringFromRequest("form_key"));
 	} else {
 		Header("Location: index.php?feedback=Successfully+Rebuilt");
 	}
 
 }
+	
 	echo $Language->getText('reporting_rebuild','message');
 ?>
+
 <form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="post">
+
 <input type="checkbox" name="im_sure" value="1"><?php echo $Language->getText('reporting_rebuild','imsure'); ?><p>
 <p>
 <input type="submit" name="submit" value="<?php echo $Language->getText('reporting_rebuild','pressonlyonce'); ?>">

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/soap/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/soap/index.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/soap/index.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -90,6 +90,11 @@
 require_once('www/soap/tracker/tracker.php');
 
 //
+//	Include Docman Functions
+//
+require_once('www/soap/docman/docman.php');
+
+//
 //	Include task manager Functions
 //
 require_once('www/soap/pm/pm.php');

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/stats/projects.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/stats/projects.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/stats/projects.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -16,6 +16,11 @@
 require_once('pre.php');
 require_once('site_stats_utils.php');
 
+$report=getStringFromRequest('report');
+$orderby=getStringFromRequest('orderby'); 
+$projects=getIntFromRequest('projects'); 
+$trovecatid=getIntFromRequest('trovecatid');
+
 // require you to be a member of the sfstats group (group_id = 11084)
 session_require( array('group'=>$sys_stats_group) );
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/stats/views_graph.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/stats/views_graph.php	2011-02-24 17:03:10 UTC (rev 11124)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/stats/views_graph.php	2011-02-24 17:03:11 UTC (rev 11125)
@@ -20,6 +20,7 @@
 
 $group_id = getIntFromRequest('group_id');
 $year = getIntFromRequest('year');
+$monthly = getIntFromRequest('monthly');
 
 if ( ! $group_id ) {
 	$group_id = 0;



More information about the evolvis-commits mailing list