[Vtigercrm-developers] [vtiger-commits] r3868 - in /vtigercrm/branches/4.2: jpgraph/ jpgraph/lang/ jpgraph/src/ modules/Calendar/ modules/Cases/ modules/Potentials/

vtiger-commits at vtiger.fosslabs.com vtiger-commits at vtiger.fosslabs.com
Tue Feb 21 10:44:03 PST 2006 

Author: jeffk
Date: Tue Feb 21 11:43:20 2006
New Revision: 3868

Log:
fixed #15. brought to zero-diff jpgraph-1.20.3. testing comprised loading sample dataset, generating charts on dashboard, successful. repaired such references to jpgraph/src layout as could be found, be on the lookout for others built with string maninupulation.

Added:
    vtigercrm/branches/4.2/jpgraph/flags.dat
      - copied unchanged from r3866, vtigercrm/branches/4.2/jpgraph/src/flags.dat
    vtigercrm/branches/4.2/jpgraph/flags_thumb100x100.dat
      - copied unchanged from r3866, vtigercrm/branches/4.2/jpgraph/src/flags_thumb100x100.dat
    vtigercrm/branches/4.2/jpgraph/flags_thumb35x35.dat
      - copied unchanged from r3866, vtigercrm/branches/4.2/jpgraph/src/flags_thumb35x35.dat
    vtigercrm/branches/4.2/jpgraph/flags_thumb60x60.dat
      - copied unchanged from r3866, vtigercrm/branches/4.2/jpgraph/src/flags_thumb60x60.dat
    vtigercrm/branches/4.2/jpgraph/imgdata_balls.inc
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/imgdata_balls.inc
    vtigercrm/branches/4.2/jpgraph/imgdata_bevels.inc
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/imgdata_bevels.inc
    vtigercrm/branches/4.2/jpgraph/imgdata_diamonds.inc
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/imgdata_diamonds.inc
    vtigercrm/branches/4.2/jpgraph/imgdata_pushpins.inc
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/imgdata_pushpins.inc
    vtigercrm/branches/4.2/jpgraph/imgdata_squares.inc
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/imgdata_squares.inc
    vtigercrm/branches/4.2/jpgraph/imgdata_stars.inc
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/imgdata_stars.inc
    vtigercrm/branches/4.2/jpgraph/jpg-config.inc
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpg-config.inc
    vtigercrm/branches/4.2/jpgraph/jpgraph.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_antispam-digits.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_antispam.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_bar.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_bar.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_canvas.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_canvas.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_canvtools.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_canvtools.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_date.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_error.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_error.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_flags.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_flags.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_gantt.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_gantt.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_gb2312.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_gb2312.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_gradient.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_gradient.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_iconplot.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_iconplot.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_imgtrans.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_imgtrans.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_line.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_line.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_log.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_log.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_pie.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_pie.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_pie3d.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_pie3d.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_plotband.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_plotband.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_plotmark.inc
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_plotmark.inc
    vtigercrm/branches/4.2/jpgraph/jpgraph_polar.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_polar.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_radar.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_radar.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_regstat.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_regstat.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_scatter.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_scatter.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_stock.php
      - copied, changed from r3866, vtigercrm/branches/4.2/jpgraph/src/jpgraph_stock.php
    vtigercrm/branches/4.2/jpgraph/jpgraph_utils.inc
    vtigercrm/branches/4.2/jpgraph/lang/
    vtigercrm/branches/4.2/jpgraph/lang/en.inc.php
Removed:
    vtigercrm/branches/4.2/jpgraph/IMPORTANT_DO_README
    vtigercrm/branches/4.2/jpgraph/QPL.txt
    vtigercrm/branches/4.2/jpgraph/README
    vtigercrm/branches/4.2/jpgraph/src/
Modified:
    vtigercrm/branches/4.2/modules/Calendar/webelements.p3
    vtigercrm/branches/4.2/modules/Cases/Charts.php
    vtigercrm/branches/4.2/modules/Potentials/Charts.php

Modified: vtigercrm/branches/4.2/modules/Calendar/webelements.p3
==============================================================================
--- vtigercrm/branches/4.2/modules/Calendar/webelements.p3 (original)
+++ vtigercrm/branches/4.2/modules/Calendar/webelements.p3 Tue Feb 21 11:43:20 2006
@@ -2037,10 +2037,10 @@
       return true;
 	}
 	$msg .= "JPraph Version " . JPG_VERSION ."<br>";
-  } else if (file_exists (getcwd()."/".$tutos['base']."/". $tutos[jpgraph]."/src/jpgraph.php") ) {
-    require_once $tutos[jpgraph]."/src/jpgraph.php";
+  } else if (file_exists (getcwd()."/".$tutos['base']."/". $tutos[jpgraph]."/jpgraph.php") ) {
+    require_once $tutos[jpgraph]."/jpgraph.php";
     foreach($arr as $i) {
-      require_once $tutos[jpgraph]."/src/". $i;
+      require_once $tutos[jpgraph]."/". $i;
     }
     if (!defined('JPG_VERSION') ) {
       $tutos[jpgraph_old] = 1;

Modified: vtigercrm/branches/4.2/modules/Cases/Charts.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Cases/Charts.php (original)
+++ vtigercrm/branches/4.2/modules/Cases/Charts.php Tue Feb 21 11:43:20 2006
@@ -29,8 +29,8 @@
 	 * to display in the y-axis
 	 */
 	function pipeline ($datax=array('foo','bar'),$datay=array(1,2), $title='the title', $subtitle='the subtitle') {
-		include ("jpgraph/src/jpgraph.php");
-		include ("jpgraph/src/jpgraph_bar.php");
+		include ("jpgraph/jpgraph.php");
+		include ("jpgraph/jpgraph_bar.php");
 	
 		$log =& LoggerManager::getLogger('case charts');
 		$log->debug("starting pipeline chart");
@@ -139,9 +139,9 @@
 	 * to display in the y-axis
 	 */
 	function pipeline_by_lead_source ($legends=array('foo', 'bar'), $data=array(1,2), $title='the title', $subtitle='the subtitle') {
-		include ("jpgraph/src/jpgraph.php");
-		include ("jpgraph/src/jpgraph_pie.php");
-		include ("jpgraph/src/jpgraph_pie3d.php");
+		include ("jpgraph/jpgraph.php");
+		include ("jpgraph/jpgraph_pie.php");
+		include ("jpgraph/jpgraph_pie3d.php");
 		
 		// Create the Pie Graph.
 		$graph = new PieGraph(440,200,"auto");

Modified: vtigercrm/branches/4.2/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/Charts.php (original)
+++ vtigercrm/branches/4.2/modules/Potentials/Charts.php Tue Feb 21 11:43:20 2006
@@ -20,7 +20,7 @@
 require_once('config.php');
 require_once('include/logging.php');
 require_once('modules/Potentials/Opportunity.php');
-require_once("jpgraph/src/jpgraph.php");
+require_once("jpgraph/jpgraph.php");
 require_once('include/utils.php');
 require_once('include/logging.php');
 
@@ -76,7 +76,7 @@
 	function outcome_by_month($date_start='1971-10-15', $date_end='2071-10-15', $user_id=array('1'), $cache_file_name='a_file', $refresh=false) {
 		global $app_strings,$lang_crm, $app_list_strings, $current_module_strings, $log, $charset, $tmp_dir;
 		global $theme;
-		include_once ("jpgraph/src/jpgraph_bar.php");
+		include_once ("jpgraph/jpgraph_bar.php");
 
 		// Size of graph
 		$width=600;
@@ -348,7 +348,7 @@
 		global $app_strings,$lang_crm, $current_module_strings, $log, $charset, $tmp_dir;
 		global $theme;
 
-		include_once ("jpgraph/src/jpgraph_bar.php");
+		include_once ("jpgraph/jpgraph_bar.php");
 
 		// Size of graph
 		$width=300;
@@ -631,7 +631,7 @@
 	function pipeline_by_sales_stage($datax=array('foo','bar'), $date_start='2071-10-15', $date_end='2071-10-15', $user_id=array('1'), $cache_file_name='a_file', $refresh=false) {
 		global $app_strings,$lang_crm, $current_module_strings, $log, $charset, $tmp_dir;
 		global $theme;
-		include_once ("jpgraph/src/jpgraph_bar.php");
+		include_once ("jpgraph/jpgraph_bar.php");
 
 		// Size of graph
 		$width=300;
@@ -905,8 +905,8 @@
 		global $app_strings,$lang_crm, $current_module_strings, $log, $charset, $tmp_dir;
 		global $theme;
 
-		include_once ("jpgraph/src/jpgraph_pie.php");
-		include_once ("jpgraph/src/jpgraph_pie3d.php");
+		include_once ("jpgraph/jpgraph_pie.php");
+		include_once ("jpgraph/jpgraph_pie3d.php");
 
 		$font = calculate_font_family($lang_crm);

More information about the vtigercrm-developers mailing list