Menu
▾
▴
andro-hacker — For under-the-hood topics
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
|
Feb
(58) |
Mar
(126) |
Apr
(96) |
May
(42) |
Jun
(59) |
Jul
(80) |
Aug
(95) |
Sep
(99) |
Oct
(137) |
Nov
(54) |
Dec
(138) |
| 2009 |
Jan
(174) |
Feb
(83) |
Mar
(36) |
Apr
(22) |
May
(16) |
Jun
(11) |
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ken...@us...> - 2009-01-30 21:06:31
|
Revision: 1212
http://andro.svn.sourceforge.net/andro/?rev=1212&view=rev
Author: kendowns
Date: 2009-01-30 21:06:25 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
Added Paths:
-----------
releases/2009.01.30/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-01-30 21:05:33
|
Revision: 1211
http://andro.svn.sourceforge.net/andro/?rev=1211&view=rev
Author: kendowns
Date: 2009-01-30 21:05:28 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
remove stray line break in duplication error messages.
Modified Paths:
--------------
trunk/andro/lib/spyc.php
Modified: trunk/andro/lib/spyc.php
===================================================================
--- trunk/andro/lib/spyc.php 2009-01-30 16:19:32 UTC (rev 1210)
+++ trunk/andro/lib/spyc.php 2009-01-30 21:05:28 UTC (rev 1211)
@@ -727,7 +727,7 @@
$line = $node->lineNumber;
if(isset($keyslines[$key])) {
$this->errors[] =
- "<br/>Definition '$key' at line $line "
+ "Definition '$key' at line $line "
."duplicates line {$keyslines[$key]}";
}
else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dor...@us...> - 2009-01-30 16:19:35
|
Revision: 1210
http://andro.svn.sourceforge.net/andro/?rev=1210&view=rev
Author: dorgan1983
Date: 2009-01-30 16:19:32 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
Typo fix
Added Paths:
-----------
dev-releases/2009.01.30.4/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dor...@us...> - 2009-01-30 16:18:33
|
Revision: 1209
http://andro.svn.sourceforge.net/andro/?rev=1209&view=rev
Author: dorgan1983
Date: 2009-01-30 16:18:30 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
Typo fix
Modified Paths:
--------------
trunk/andro/application/androBuild.php
Modified: trunk/andro/application/androBuild.php
===================================================================
--- trunk/andro/application/androBuild.php 2009-01-30 16:15:46 UTC (rev 1208)
+++ trunk/andro/application/androBuild.php 2009-01-30 16:18:30 UTC (rev 1209)
@@ -176,9 +176,9 @@
);
if ( isset( $parm['INST'] ) ) {
- $app = str_replace( '_' .$parm['INST'], '', $parm['APPLICATION'] );
+ $app = str_replace( '_' .$parm['INST'], '', $parm['APP'] );
} else {
- $app = $parm['APPLICATION'];
+ $app = $parm['APP'];
}
if ($parm["SPEC_LIST"]<>"") {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dor...@us...> - 2009-01-30 16:15:49
|
Revision: 1208
http://andro.svn.sourceforge.net/andro/?rev=1208&view=rev
Author: dorgan1983
Date: 2009-01-30 16:15:46 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
One final tweak to "Smart" builder.
Added Paths:
-----------
dev-releases/2009.01.30.3/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dor...@us...> - 2009-01-30 16:15:19
|
Revision: 1207
http://andro.svn.sourceforge.net/andro/?rev=1207&view=rev
Author: dorgan1983
Date: 2009-01-30 16:15:09 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
ok one final change and we should be go to go.
Modified Paths:
--------------
trunk/andro/application/androBuild.php
Modified: trunk/andro/application/androBuild.php
===================================================================
--- trunk/andro/application/androBuild.php 2009-01-30 15:56:43 UTC (rev 1206)
+++ trunk/andro/application/androBuild.php 2009-01-30 16:15:09 UTC (rev 1207)
@@ -174,6 +174,13 @@
'md5'=>md5_file( $parm['DIR_PUB']."lib/".$specboot ),
'fullpath'=>$parm['DIR_PUB']."lib/".$specboot
);
+
+ if ( isset( $parm['INST'] ) ) {
+ $app = str_replace( '_' .$parm['INST'], '', $parm['APPLICATION'] );
+ } else {
+ $app = $parm['APPLICATION'];
+ }
+
if ($parm["SPEC_LIST"]<>"") {
$speclist = explode(",",$parm["SPEC_LIST"]);
foreach ($speclist as $spec) {
@@ -195,10 +202,9 @@
$this->LogEntry("Instance tracking table doesnt exist yet...ignoring until next build");
return true;
}
-
foreach( $checksums as $checksum ) {
$query = "SELECT checksum,skey FROM " .ddTable_idResolve( 'instance_spec_checksums' ) ." WHERE
- application=" .SQLFC( $parm['APP'] ) ." AND spec_name=" .SQLFC( $checksum['file'] )
+ application=" .SQLFC( $app ) ." AND spec_name=" .SQLFC( $checksum['file'] )
.( isset( $parm['INST'] ) ? " AND instance=" .SQLFC( $parm['INST'] ) : '' );
$row = SQL_OneRow( $query );
@@ -217,7 +223,7 @@
} else {
$this->LogEntry( 'Entry for ' .$checksum['file'] .' not found' );
$checksum_entry = array(
- 'application'=>$parm['APP'],
+ 'application'=>$app,
'instance'=>( isset( $parm['INST'] ) ? $parm['INST'] : '' ),
'spec_name'=>$checksum['file'],
'checksum'=>md5_file( $checksum['fullpath'] )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dor...@us...> - 2009-01-30 15:56:46
|
Revision: 1206
http://andro.svn.sourceforge.net/andro/?rev=1206&view=rev
Author: dorgan1983
Date: 2009-01-30 15:56:43 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
Tweak for smart builder and kens YAML parser enhancements
Added Paths:
-----------
dev-releases/2009.01.30.2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dor...@us...> - 2009-01-30 15:55:58
|
Revision: 1205
http://andro.svn.sourceforge.net/andro/?rev=1205&view=rev
Author: dorgan1983
Date: 2009-01-30 15:55:55 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
One more change and smart builder should be happy.
Modified Paths:
--------------
trunk/andro/application/andro.dd.yaml
Modified: trunk/andro/application/andro.dd.yaml
===================================================================
--- trunk/andro/application/andro.dd.yaml 2009-01-30 15:49:43 UTC (rev 1204)
+++ trunk/andro/application/andro.dd.yaml 2009-01-30 15:55:55 UTC (rev 1205)
@@ -186,7 +186,10 @@
description: Checksum
type_id: vchar
colprec: 100
-
+column spec_name:
+ description: Spec File
+ type_id:vchar
+ colprec: 25
table instance_spec_checksums:
module: apps
description: Instance Spec Checksums
@@ -195,9 +198,8 @@
foreign_key instances:
primary_key: "Y"
allow_empty: "Y"
+ uisearch: "Y"
column spec_name:
- prefix: spec_
- description: Spec File
uisearch: "Y"
column checksum:
primary_key: "Y"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dor...@us...> - 2009-01-30 15:49:46
|
Revision: 1204
http://andro.svn.sourceforge.net/andro/?rev=1204&view=rev
Author: dorgan1983
Date: 2009-01-30 15:49:43 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
Typo fix.
Modified Paths:
--------------
trunk/andro/application/androBuild.php
Modified: trunk/andro/application/androBuild.php
===================================================================
--- trunk/andro/application/androBuild.php 2009-01-30 15:44:39 UTC (rev 1203)
+++ trunk/andro/application/androBuild.php 2009-01-30 15:49:43 UTC (rev 1204)
@@ -223,7 +223,7 @@
'checksum'=>md5_file( $checksum['fullpath'] )
);
SQLX_Insert( 'instance_spec_checksums', $checksum_entry );
- $this->LogEntry("Spec File Change:" .$checksum['file'] );
+ $this->LogEntry("Spec File Changed: " .$checksum['file'] );
$changed = true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-01-30 15:44:42
|
Revision: 1203
http://andro.svn.sourceforge.net/andro/?rev=1203&view=rev
Author: kendowns
Date: 2009-01-30 15:44:39 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
trival: extra lines
Modified Paths:
--------------
trunk/andro/application/andro.dd.yaml
Modified: trunk/andro/application/andro.dd.yaml
===================================================================
--- trunk/andro/application/andro.dd.yaml 2009-01-30 15:43:45 UTC (rev 1202)
+++ trunk/andro/application/andro.dd.yaml 2009-01-30 15:44:39 UTC (rev 1203)
@@ -29,6 +29,7 @@
permupd: "Y"
permdel: "Y"
nomenu: "N"
+
# ========================================================================
# Options
@@ -294,6 +295,7 @@
colprec: 15
description: Top Directory
+
table appdirs:
description: Application Directories
module: thisnode
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-01-30 15:43:48
|
Revision: 1202
http://andro.svn.sourceforge.net/andro/?rev=1202&view=rev
Author: kendowns
Date: 2009-01-30 15:43:45 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
Sourceforge bug # 2545776, improved line # reporting, fixed reporting of line #'s for duplicate properties.
Modified Paths:
--------------
trunk/andro/lib/spyc.php
Modified: trunk/andro/lib/spyc.php
===================================================================
--- trunk/andro/lib/spyc.php 2009-01-30 15:33:11 UTC (rev 1201)
+++ trunk/andro/lib/spyc.php 2009-01-30 15:43:45 UTC (rev 1202)
@@ -709,6 +709,35 @@
if (!isset($this->_indentSort[0])) {
return $trunk;
}
+
+ # KFD 1/30/09, Moved Duplication check to top, before
+ # attempting to build tree.
+ #
+ foreach($this->_allParent as $parId=>$childs) {
+ # Make a blank array of keys and line numbers
+ $keyslines = array();
+ foreach($childs as $id) {
+ $node = $this->_allNodes[$id];
+ # Data seems to always be an array of one entry
+ list($key,$notused) = each($node->data);
+ # This is necessary or downstream code is all messed up
+ reset($node->data);
+ # Numeric entries should not be de-duped
+ if(is_numeric($key)) continue;
+ $line = $node->lineNumber;
+ if(isset($keyslines[$key])) {
+ $this->errors[] =
+ "<br/>Definition '$key' at line $line "
+ ."duplicates line {$keyslines[$key]}";
+ }
+ else {
+ $keyslines[$key] = $line;
+ }
+ }
+ }
+ if(count($this->errors)>0) return $trunk;
+ #
+ # KFD 1/30/09 (END)
foreach ($this->_indentSort[0] as $n) {
if (empty($n->parent)) {
@@ -882,34 +911,9 @@
$keys = array_merge(array_keys($arr1),array_keys($arr2));
$vals = array_merge(array_values($arr1),array_values($arr2));
$ret = array();
- /*
- * KFD: This code shows how the 2nd overwrites the first
- if(isset($arr2['column geomatrixcd'])) {
- if(!isset($GLOBALS['geo'])) $GLOBALS['geo'] = 0;
- $GLOBALS['geo']++;
- if($GLOBALS['geo']==2) {
- hprint_r($keys);
- hprint_r($vals);
- exit;
- }
- }
- */
foreach($keys as $key) {
list($unused,$val) = each($vals);
- if (isset($ret[$key]) and is_int($key)) {
- $ret[] = $val;
- }
- else {
- # KFD 1/28/09, Trap for duplicate keys here and record
- # the error.
- if(isset($ret[$key])) {
- $l1 = $arr1[$key]['__yaml_line'];
- $l2 = $arr2[$key]['__yaml_line'];
- $this->errors[]
- = "Entry '$key' duplicated on lines $l1 and $l2 ";
- }
- $ret[$key] = $val;
- }
+ if (isset($ret[$key]) and is_int($key)) $ret[] = $val; else $ret[$key] = $val;
}
return $ret;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dor...@us...> - 2009-01-30 15:33:15
|
Revision: 1201
http://andro.svn.sourceforge.net/andro/?rev=1201&view=rev
Author: dorgan1983
Date: 2009-01-30 15:33:11 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
Added Paths:
-----------
dev-releases/2009.01.30.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dor...@us...> - 2009-01-30 15:33:01
|
Revision: 1200
http://andro.svn.sourceforge.net/andro/?rev=1200&view=rev
Author: dorgan1983
Date: 2009-01-30 15:32:37 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
Increasing column application size to handle true application name when instance is specified
Modified Paths:
--------------
trunk/andro/application/andro.dd.yaml
Modified: trunk/andro/application/andro.dd.yaml
===================================================================
--- trunk/andro/application/andro.dd.yaml 2009-01-30 15:09:20 UTC (rev 1199)
+++ trunk/andro/application/andro.dd.yaml 2009-01-30 15:32:37 UTC (rev 1200)
@@ -50,9 +50,11 @@
group admin:
nomenu: "N"
+# DO 1-30-2009 Increasing column to accomodate true application name
+# when instance is specified
column application:
type_id: char
- colprec: 10
+ colprec: 25
description: Application
column appspec:
description: Specification File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dor...@us...> - 2009-01-30 15:09:23
|
Revision: 1199
http://andro.svn.sourceforge.net/andro/?rev=1199&view=rev
Author: dorgan1983
Date: 2009-01-30 15:09:20 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
Adding in "Smart" Builder Hopefully this wont break anything
Added Paths:
-----------
dev-releases/2009.01.30/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dor...@us...> - 2009-01-30 15:03:29
|
Revision: 1198
http://andro.svn.sourceforge.net/andro/?rev=1198&view=rev
Author: dorgan1983
Date: 2009-01-30 15:03:27 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
Fixing typo
Modified Paths:
--------------
trunk/andro/application/androBuild.php
Modified: trunk/andro/application/androBuild.php
===================================================================
--- trunk/andro/application/androBuild.php 2009-01-30 15:02:42 UTC (rev 1197)
+++ trunk/andro/application/androBuild.php 2009-01-30 15:03:27 UTC (rev 1198)
@@ -218,7 +218,7 @@
$this->LogEntry( 'Entry for ' .$checksum['file'] .' not found' );
$checksum_entry = array(
'application'=>$parm['APP'],
- 'instance'=>( isset( $parm['ISTANCE'] ) ? $parm['INST'] : '' ),
+ 'instance'=>( isset( $parm['INST'] ) ? $parm['INST'] : '' ),
'spec_name'=>$checksum['file'],
'checksum'=>md5_file( $checksum['fullpath'] )
);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dor...@us...> - 2009-01-30 15:03:14
|
Revision: 1197
http://andro.svn.sourceforge.net/andro/?rev=1197&view=rev
Author: dorgan1983
Date: 2009-01-30 15:02:42 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
Adding in "Smart" Builder Hopefully this wont break anything
Modified Paths:
--------------
trunk/andro/application/andro.dd.yaml
trunk/andro/application/androBuild.php
trunk/andro/application/instances_p.php
Modified: trunk/andro/application/andro.dd.yaml
===================================================================
--- trunk/andro/application/andro.dd.yaml 2009-01-30 14:32:12 UTC (rev 1196)
+++ trunk/andro/application/andro.dd.yaml 2009-01-30 15:02:42 UTC (rev 1197)
@@ -36,7 +36,7 @@
content configapp:
columns: [ x4menu, deprecated ]
update:
- - [ "N","N" ]
+ - [ N, N ]
# ========================================================================
@@ -145,6 +145,7 @@
description: Preferred Template
type_id: vchar
colprec: 40
+
table instances:
module: apps
description: Instances
@@ -177,7 +178,28 @@
description: Version Code
type_id: char
colprec: 10
+
+column checksum:
+ description: Checksum
+ type_id: vchar
+ colprec: 100
+table instance_spec_checksums:
+ module: apps
+ description: Instance Spec Checksums
+ nomenu: "Y"
+
+ foreign_key instances:
+ primary_key: "Y"
+ allow_empty: "Y"
+ column spec_name:
+ prefix: spec_
+ description: Spec File
+ uisearch: "Y"
+ column checksum:
+ primary_key: "Y"
+ uisearch: "Y"
+
table instbuilds:
module: apps
description: Instance Builds
Modified: trunk/andro/application/androBuild.php
===================================================================
--- trunk/andro/application/androBuild.php 2009-01-30 14:32:12 UTC (rev 1196)
+++ trunk/andro/application/androBuild.php 2009-01-30 15:02:42 UTC (rev 1197)
@@ -87,7 +87,11 @@
// always reduces.
#$retval = $retval && $this->JSMinify();
- if ( !isset( $_REQUEST['code_only'] ) ) {
+ // DO 1-29-2009 trying to make the builder a little smarter
+ // this way a full build will only happen if the db spec files
+ // have been changed
+ $dbFilesChanges = $this->checkDBFilesForChanges();
+ if ( $dbFilesChanges ) {
// If we passed most basic, we prepare the database
// by loading stored procedures and making the zdd
// schema to use during build.
@@ -154,6 +158,85 @@
// ===================================================================
// ==========================================================
+// Routines to check db building files for changes
+// ==========================================================
+
+function checkDBFilesForChanges() {
+ global $parm;
+
+ $this->LogStage("Checking spec files for changes");
+
+ $changed = false;
+ $checksums = array();
+ $specboot = $parm["SPEC_BOOT"].".add";
+ $checksums[] = array(
+ 'file'=>$specboot,
+ 'md5'=>md5_file( $parm['DIR_PUB']."lib/".$specboot ),
+ 'fullpath'=>$parm['DIR_PUB']."lib/".$specboot
+ );
+ if ($parm["SPEC_LIST"]<>"") {
+ $speclist = explode(",",$parm["SPEC_LIST"]);
+ foreach ($speclist as $spec) {
+ if(substr($spec,-5)<>'.yaml') {
+ $file = $spec.".add";
+ } else {
+ $file = $spec;
+ }
+ $checksums[] = array(
+ 'file'=>$file,
+ 'md5'=>md5_file( $parm["DIR_PUB"]."application/".$file ),
+ 'fullpath'=>$parm["DIR_PUB"]."application/".$file
+ );
+ }
+ }
+ $checkqry = "SELECT relname FROM pg_class WHERE relname='instance_spec_checksums'";
+ $checkrslts = SQL_AllRows( $checkqry );
+ if ( count( $checkrslts ) == 0 ) {
+ $this->LogEntry("Instance tracking table doesnt exist yet...ignoring until next build");
+ return true;
+ }
+
+ foreach( $checksums as $checksum ) {
+ $query = "SELECT checksum,skey FROM " .ddTable_idResolve( 'instance_spec_checksums' ) ." WHERE
+ application=" .SQLFC( $parm['APP'] ) ." AND spec_name=" .SQLFC( $checksum['file'] )
+ .( isset( $parm['INST'] ) ? " AND instance=" .SQLFC( $parm['INST'] ) : '' );
+ $row = SQL_OneRow( $query );
+
+ if ( $row ) {
+ $this->LogEntry( 'Entry for ' .$checksum['file'] .' file found' );
+ if ( $row['checksum'] != $checksum['md5'] ) {
+ $this->LogEntry("Spec File Changed: " .$checksum['file'] );
+ $changed = true;
+ $checksum_update = array(
+ 'skey'=>$row['skey'],
+ 'checksum'=>md5_file( $checksum['fullpath'] )
+ );
+ SQLX_Update( 'instance_spec_checksums', $checksum_update );
+ $this->LogEntry( "Updating Entry" );
+ }
+ } else {
+ $this->LogEntry( 'Entry for ' .$checksum['file'] .' not found' );
+ $checksum_entry = array(
+ 'application'=>$parm['APP'],
+ 'instance'=>( isset( $parm['ISTANCE'] ) ? $parm['INST'] : '' ),
+ 'spec_name'=>$checksum['file'],
+ 'checksum'=>md5_file( $checksum['fullpath'] )
+ );
+ SQLX_Insert( 'instance_spec_checksums', $checksum_entry );
+ $this->LogEntry("Spec File Change:" .$checksum['file'] );
+ $changed = true;
+ }
+
+ }
+ if ( $changed ) {
+ $this->LogEntry( 'One or more spec files have changed: Proceeding with full build' );
+ } else {
+ $this->LogEntry( 'Spec files have not changed: Proceeding with mini build' );
+ }
+ return $changed;
+}
+
+// ==========================================================
// Database Connect Routines
// ==========================================================
function DB_Connect()
Modified: trunk/andro/application/instances_p.php
===================================================================
--- trunk/andro/application/instances_p.php 2009-01-30 14:32:12 UTC (rev 1196)
+++ trunk/andro/application/instances_p.php 2009-01-30 15:02:42 UTC (rev 1197)
@@ -97,21 +97,6 @@
,'gp_ver'=>$verx
)
);
- echo( '<br />' );
- echo hLinkPopup(
- '',
- 'Deploy code from
- version '.$verx
- ,array(
- 'gp_app'=>gp('gp_app')
- ,'gp_inst'=>gp('gp_inst')
- ,'gp_posted'=>1
- ,'gp_page'=>'instances_p2'
- ,'gp_out'=>'none'
- ,'gp_ver'=>$verx
- ,'code_only'=>1
- )
- );
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-01-30 14:32:16
|
Revision: 1196
http://andro.svn.sourceforge.net/andro/?rev=1196&view=rev
Author: kendowns
Date: 2009-01-30 14:32:12 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
MAJOR UPDATE: All shortcut tags removed from andro/application, andro/lib, andro/templates/rt_pixel, andro/templates/pixel2, and andro/templates/x6
Modified Paths:
--------------
trunk/andro/application/a_builder_log.php
trunk/andro/application/a_pullcode.php
trunk/andro/application/a_scontrol.php
trunk/andro/application/applib.php
trunk/andro/application/appversions_p.php
trunk/andro/application/install.done.php
trunk/andro/application/instance_import.php
trunk/andro/application/instances_p.php
trunk/andro/application/x_welcome.php
trunk/andro/lib/androHTMLFoot.php
trunk/andro/lib/androHTMLHead.php
trunk/andro/lib/androLib.php
trunk/andro/lib/androPage.php
trunk/andro/lib/androX4Menu.php
trunk/andro/lib/html_main_paypal_process.php
trunk/andro/lib/html_popup.php
trunk/andro/lib/html_print.php
trunk/andro/lib/html_print_display.php
trunk/andro/lib/paypal_global_config.inc.php
trunk/andro/lib/reports.php
trunk/andro/lib/x6menu.php
trunk/andro/lib/x6skinJob.php
trunk/andro/lib/x6skinShow.php
trunk/andro/lib/x6useroptions.php
trunk/andro/lib/x_docview.php
trunk/andro/lib/x_email.php
trunk/andro/lib/x_emailblast.php
trunk/andro/lib/x_import.php
trunk/andro/lib/x_login.php
trunk/andro/lib/x_password.php
trunk/andro/lib/x_report.php
trunk/andro/lib/x_table2.php
trunk/andro/lib/x_welcome.php
trunk/andro/templates/pixel2/index.php
trunk/andro/templates/rt_pixel/andro_classic/index.php
trunk/andro/templates/rt_pixel/andromeda.php
trunk/andro/templates/rt_pixel/index.php
trunk/andro/templates/x6/index.php
Added Paths:
-----------
trunk/andro/application/x6welcome.php
Removed Paths:
-------------
trunk/andro/application/andro.add
Modified: trunk/andro/application/a_builder_log.php
===================================================================
--- trunk/andro/application/a_builder_log.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/application/a_builder_log.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -24,7 +24,8 @@
function main() {
echo "<h1>View Build Log</h1>";
?>
-<p>Currently viewing the log for application code "<b><?=CleanGet('application')?></b>". Click any
+<p>Currently viewing the log for application code "
+ <b><?php echo gp('application')?></b>". Click any
of the links below to see the logs for the particular application:</p>
<?php
// Run out list of apps they can see
Modified: trunk/andro/application/a_pullcode.php
===================================================================
--- trunk/andro/application/a_pullcode.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/application/a_pullcode.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -46,7 +46,7 @@
<a href="javascript:Popup('?gp_page=a_pullcode&gp_posted=2')">Step 1: Get Code</a>
<br/>
<br/>
- <?=hLinkBuild('andro','Step 2: Rebuild Node Manager')?>
+ <?php echo hLinkBuild('andro','Step 2: Rebuild Node Manager')?>
<h1>Download Latest Software Updates</h1>
Modified: trunk/andro/application/a_scontrol.php
===================================================================
--- trunk/andro/application/a_scontrol.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/application/a_scontrol.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -51,17 +51,17 @@
?>
<h1>Source Code Operations</h1>
<p>For application
- <a href="?gp_page=applications&gp_skey=<?=$skey?>"><?=$App?></a>.
+ <a href="?gp_page=applications&gp_skey=<?php echo $skey?>"><?php echo $App?></a>.
</p>
- <?=sourceDeprecated()?>
+ <?php echo sourceDeprecated()?>
<?php
if(!$this->CheckRemoteUID($node['node'])) return;
?>
<p><a href="javascript:formPostString('x=y')">Refresh This Page</a></p>
<p>The Authoritative Node for this application is
- <?=$node['node']?> at <?=$node['node_url']?>.
- You are using username <b><?=SessionGet('remoteUID')?></b> on
+ <?php echo $node['node']?> at <?php echo $node['node_url']?>.
+ You are using username <b><?php echo SessionGet('remoteUID')?></b> on
the remote node.
<a href="javascript:formPostString('gp_clearremote=1')">Connect as New User</a>.
</p>
@@ -72,7 +72,7 @@
<tr><td class="dhead" width=100>Function</td>
<td class="dhead">Details</td>
<tr><td>
- <a href="javascript:Popup('<?=$h1?>')">
+ <a href="javascript:Popup('<?php echo $h1?>')">
Update Reference</a>
<td>Pulls the latest code from the Authoritative Node and puts
it into the "ref" directory of the application. Does not
@@ -247,19 +247,19 @@
?>
<p>
- The authoritative node for this application is <b><?=$node?></b>.
+ The authoritative node for this application is <b><?php echo $node?></b>.
Please provide your user id and password for that node.
</p>
<table>
<tr><td style="text-align: right">Remote user id
<td style="text-align: left"><input name="remoteUID" id="remoteUID"
- tabindex="<?=hpTabIndexNext(100)?>">
+ tabindex="<?php echo hpTabIndexNext(100)?>">
<tr><td style="text-align: right">Remote password
<td style="text-align: left"><input name="remotePWD" type="password"
- tabindex="<?=hpTabIndexNext(100)?>">
+ tabindex="<?php echo hpTabIndexNext(100)?>">
</table>
<br/>
- <input type="submit" value="Save" tabindex="<?=hpTabIndexNext(100)?>">
+ <input type="submit" value="Save" tabindex="<?php echo hpTabIndexNext(100)?>">
<?php
vgfSet('HTML_focus','remoteUID');
Deleted: trunk/andro/application/andro.add
===================================================================
--- trunk/andro/application/andro.add 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/application/andro.add 2009-01-30 14:32:12 UTC (rev 1196)
@@ -1,304 +0,0 @@
-// ========================================================================
-// Andromeda Node Manager Specification
-// (C) Copyright 2005 Kenneth Downs.
-// This file is part of Andromeda
-// ========================================================================
-module sysmaint { uisort: 820; description: System Maintenance; }
-module operations {
- uisort: 100; description: Operations;
- group $LOGIN { nomenu: N; }
- group admin { nomenu: N; }
-}
-
-// Node manager needs URL to put into links for email resets
-content variables {
- columns { variable;description;variable_value }
- values { PWURL ;URL For Node Manager; www.somewhere.com }
-}
-
-group thedudes {
- description: Solo Dudes;
- solo: Y;
-}
-
-// Extra menu item for new user; requires some extra stuff
-//
-//module special { description: Special Tasks; uisort: 50; }
-//menu x_email { description: Send a Test Email; module: special; }
-//menu x_printtest { description: Printing tests; module: system; }
-
-
-module tests { description: Examples and Test; uisort: 300;
- group $LOGIN { permins: Y; permdel: Y; permupd: Y; permsel: Y; nomenu: N;}
-}
-
-group admin {
- permsel: Y; permins: Y; permupd: Y; permdel: Y; nomenu: N;
-
- module docs {
- permsel: Y; permins: Y; permupd: Y; permdel: Y; nomenu: N;
- }
- module system {
- permsel: Y; permins: Y; permupd: Y; permdel: Y; nomenu: N;
- }
- module reference {
- permsel: Y; permins: Y; permupd: Y; permdel: Y; nomenu: N;
- }
-}
-
-
-// ========================================================================
-// AREA: Super users, a single table
-// ========================================================================
-table usersroot {
- description: System Super-users;
- risimple: Y;
- module: sysmaint;
-
- column user_id { primary_key: Y; uisearch: Y; }
- column user_name { uisearch: Y; }
- column { email; user_disabled; user_pwkey; user_pwexp; hostip }
-
- column { member_password; automation_id: BLANK; description: Password; }
- column md5 { prefix: member_; description: MD5 Password; }
-
- //group andro_own { permins: Y; permsel: Y; }
-}
-
-// ========================================================================
-// AREA: Nodes and web directories
-// ========================================================================
-menu a_pullcode {
- module: operations;
- uisort: 99;
- description: Pull Software Updates;
-}
-
-// TABLE: Nodes
-//
-column node { description: Node; type_id: char; colprec: 10; }
-column node_url { description: Node URL; type_id: vchar; colprec: 100; }
-column dir_pub { description: Public Directory; type_id: vchar; colprec: 100; }
-column local_flag { description: Local Node; type_id: cbool; }
-column prod_flag{ description: Production Node; type_id: cbool;
- automation_id: DEFAULT; auto_formula: N;
-}
-
-table nodes {
- description: Nodes;
- module: operations;
- capspk: Y;
-
- column node { primary_key: Y; uisearch: Y; }
- column description { uisearch: Y; }
- column node_url { uisearch: Y; }
- //column local_flag { uisearch: Y; }
- //column prod_flag { uisearch: Y; }
- //column { dir_pub; }
-}
-
-table test {
- description: Test Table;
- module: operations;
- capspk: Y;
-
- column node { primary_key: Y; uisearch: Y; }
- column description { uisearch: Y; }
- column date { uisearch: Y; }
- column notes { uisearch: Y; }
-}
-
-
-column webpath { description: Nickname; type_id: char; colprec: 10; }
-table webpaths {
- description: Local Web Directories;
- module: operations;
- capspk: Y;
-
- column webpath { primary_key:Y; uisearch: Y; }
- column description { uisearch: Y; }
- column { dir_pub;}
-}
-
-// ========================================================================
-// AREA: Directories for libraries and applications
-//
-// Historical note: we use "templates" as the directory for
-// ========================================================================
-column dirname { type_id:vchar; colprec: 15; description: Top Directory; }
-table appdirs {
- description: Application Directories;
- module: operations;
- nomenu: N;
-
- column dirname { description: Top Directory;
- uisearch: Y;
- primary_key: Y;
- }
- column flag { suffix: _vis; description: Publicly Visible; uisearch:Y; }
- column flag { suffix: _copy; uisearch: Y; description: Copy when publishing; }
- column flag { suffix: _lib; uisearch: Y; description: Library Directory; }
- column description { uisearch: Y; }
-}
-content appdirs {
- columns { dirname; flag_lib; flag_copy; flag_vis; description; }
- content { root; Y; Y; N; To be copied to root; }
- content { lib; Y; Y; N; Lib Server-Side Code; }
- content { clib; Y; Y; Y; Lib Client-Side Code; }
- content { application; N; Y; N; App Server-Side Code; }
- content { appclib; N; Y; Y; App Client-Side Code; }
- content { templates; Y; Y; Y; UI Templates; }
- content { generated; N; N; N; Dictionary-generated code; }
- content { dynamic; N; N; N; Dynamic Cache; }
- content { files; N; N; N; Imports/Exports, Misc files; }
- content { tmp; N; N; N; Temporary Build Files; }
- content { apppub; N; Y; Y; App client-visible files; }
- content { instpub; N; N; Y; Instance client-visible files; }
- content { docslib; Y; Y; N; Lib Docs; }
- content { docsapp; N; Y; N; App Docs; }
- content { docsgen; N; N; N; Generated Docs; }
-}
-// ========================================================================
-// AREA: Application Versions and Files
-// ========================================================================
-//
-// TABLE: Andromeda Applications
-//
-column application { description: Application; type_id: char; colprec: 10; }
-column appspec { description: Specification File; type_id: vchar; colprec: 30; }
-column xdirs {
- description: Extra Dirs (Comma separated);
- type_id: vchar;
- colprec: 200;
-}
-table applications {
- description: Applications;
- module: operations;
- risimple: Y;
-
- column application { primary_key: Y; uisearch: Y; }
- column description { uisearch: Y; }
- column appspec { suffix: _boot; description: Bootstrap Spec File;
- automation_id: DEFAULT; auto_formula: AndroDBB;
- }
- column appspec { suffix: _lib; description: Library Spec File;
- automation_id: DEFAULT; auto_formula: andro_universal;
- }
- column appspec { description: Spec File; }
- foreign_key { webpaths;
- column webpath { description: Web Path; }
- }
-
- column flag {
- suffix: _rolelogin;
- automation_id: DEFAULT;
- auto_formula: N;
- description: Allow Group Roles to Log in;
- }
- column flag {
- suffix: _pwmd5;
- automation_id: DEFAULT;
- auto_formula: N;
- description: Hardened Password Security;
- }
- foreign_key nodes {
- allow_empty: Y;
- }
- column node { description: Authoritative Node; }
- column { xdirs; }
- column { template; }
-
- column { ts_ins; uid_ins; ts_upd; uid_upd; }
-
- projection dropdown { column { description; }}
-}
-
-column version { description: Version Code; type_id: char; colprec: 10; }
-table appversions {
- description: Application Versions;
- module: operations;
-
- foreign_key applications { uisearch: Y; primary_key: Y; uisearch:Y;}
- column version { uisearch: Y; primary_key: Y; uisearch:Y;}
- column date { suffix: _ts; description: Version Date; uisearch:Y; }
- column notes { description: Version Notes; }
-}
-table appfiles {
- description: Application Version Files;
- module: operations;
- nomenu: Y;
-
- foreign_key { appversions; primary_key: Y; uisearch:Y;}
- foreign_key { appdirs; uisearch:Y;}
- column { filename; primary_key: Y; uisearch:Y;}
- column { filepath; }
- column { filecnts; uisearch:Y;}
- column flag { suffix: _del; description: File Deleted; }
- column ts { prefix: file; description: File timestamp; uisearch:Y; }
- column md5 { prefix: file; description: File md5; }
-}
-
-// ========================================================================
-// AREA: Instances
-// An instance links into a application and version. That application
-// itself links over to libraries.
-// ========================================================================
-column instance { description: Instance Code; type_id:char; colprec: 12; }
-column template {
- description: Preferred Template;
- type_id: vchar;
- colprec: 40;
-}
-table instances {
- module: operations;
- description: Instances;
-
- column instance { primary_key: Y; uisearch: Y;
- // Odd point here: We cannot put a constraint on the foreign key,
- // which is a bummer. So we have a constraint on the foreign key
- // defined on another column, go figure.
- chain cons {
- test { compare: @application = andro;
- return: Instances of Node Manager Are Not Allowed;
- }
- }
-
- }
- foreign_key applications { primary_key: Y; uisearch: Y; }
- column { template; }
-
- // These are supposed to be filled in by builder
- column version { uisearch: Y; uiro: Y;}
-}
-table instbuilds {
- module: operations;
- description: Instance Builds;
- nomenu: Y;
-
- column recnum { primary_key: Y; }
- column application { suffix: _from; uiro: Y; }
- column version { suffix: _from; uiro: Y; }
- column application { suffix: _to; uiro: Y; }
- column version { suffix: _to; uiro: Y; }
-
- column ts { suffix: _beg; uiro: Y; }
- column ts { suffix: _end; uiro: Y; }
- column flag { suffix: _close; uiro: Y; }
- column flag { suffix: _ok; uiro: Y; }
-}
-
-// Table of downloads history
-column iphash { type_id: char; colprec: 32; description: IP Number Hash; }
-table downloads {
- module: operations;
- description: Download History;
-
- column recnum { primary_key: Y; }
- column { iphash; filename; ts_ins; uisearch: Y; }
-
- index iphash { column { iphash; }}
-}
-
-
-
-
Modified: trunk/andro/application/applib.php
===================================================================
--- trunk/andro/application/applib.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/application/applib.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -13,6 +13,19 @@
vgfSet('template','rt_pixel');
+/* FUTURE X6 STUFF
+function app_nopage() {
+ if(LoggedIn()) {
+ return 'cpanel';
+ }
+}
+
+function defaultSuperUser() {
+ return 'install';
+}
+*/
+
+
function AppDir($app) {
$app=trim($app);
$wp=SQL_OneValue('dir_pub',
@@ -162,10 +175,10 @@
<?php foreach($apps as $app) { ?>
<tr>
<td align="left" class="leftcol">
- <a href="?gp_page=applications&gp_skey=<?=$app['skey']?>"
- ><?=$app['application']?></a>
+ <a href="?gp_page=applications&gp_skey=<?php echo $app['skey']?>"
+ ><?php echo $app['application']?></a>
<td align="right" class="leftcol">
- <?=hLinkBuild($app['application'],'Build')?>
+ <?php echo hLinkBuild($app['application'],'Build')?>
<?php }?>
</table>
<br/>
@@ -183,12 +196,12 @@
<?php foreach($instances as $i) { ?>
<tr>
<td align="left">
- <a href="?gp_page=instances&bp_skey=<?=$i['skey']?>">
- <?=$i['application'].' / '.$i['instance']?>
+ <a href="?gp_page=instances&bp_skey=<?php echo $i['skey']?>">
+ <?php echo $i['application'].' / '.$i['instance']?>
</a>
<td align="right">
- <a href="?gp_page=instances_p&gp_app=<?=trim($i['application'])
- ?>&gp_inst=<?=$i['instance']?>"
+ <a href="?gp_page=instances_p&gp_app=<?php echo trim($i['application'])
+ ?>&gp_inst=<?php echo $i['instance']?>"
>Build/Upgrade</a>
<?php } ?>
</table>
Modified: trunk/andro/application/appversions_p.php
===================================================================
--- trunk/andro/application/appversions_p.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/application/appversions_p.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -59,12 +59,12 @@
?>
<h1>Freeze Current Version</h1>
<p>This program will create a new version of all application files
- for application <?=hSanitize(gp('gp_app'))?>.
+ for application <?php echo hSanitize(gp('gp_app'))?>.
It will copy all disk files into the database.
- The version will be numbered as <?=$v?>.
+ The version will be numbered as <?php echo $v?>.
</p>
- <p>The top level directory to be scanned is: <?=$root?>.
+ <p>The top level directory to be scanned is: <?php echo $root?>.
</p>
<p>The subdirectories to be scanned are:
@@ -78,7 +78,7 @@
?>
</ul>
- <p><a href="javascript:Popup('<?=$link?>')">Process Now</a>
+ <p><a href="javascript:Popup('<?php echo $link?>')">Process Now</a>
</p>
<?php
Modified: trunk/andro/application/install.done.php
===================================================================
--- trunk/andro/application/install.done.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/application/install.done.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -108,7 +108,7 @@
</table>
<br>
- <h2>Next Step: <?=$steps[$current_step][1]?></h2>
+ <h2>Next Step: <?php echo $steps[$current_step][1]?></h2>
<?php
if($this->error) {
echo "<div class='errorbox'>".$this->error."</div>";
@@ -126,7 +126,7 @@
<p>Install mode is triggered by the presence of the file
'install.php' in the application directory:
- <p><?=$GLOBALS['AG']['dirs']['application']?>
+ <p><?php echo $GLOBALS['AG']['dirs']['application']?>
<p>If you are
an expert and wish to bypass this wizard, then simply remove
@@ -503,7 +503,7 @@
?>
<div class="errorbox">PostgreSQL must be version 8.1 or better</div>
- <p>The install program has detected <?=$this->pgversion?>, the minimum
+ <p>The install program has detected <?php echo $this->pgversion?>, the minimum
version required to run Andromeda is 8.1. Please upgrade to version
8.1 or better and then rerun the installation.
<?php
Modified: trunk/andro/application/instance_import.php
===================================================================
--- trunk/andro/application/instance_import.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/application/instance_import.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -40,11 +40,11 @@
subdirectory, application code in 'app' and library code in 'lib'.
<p>Any files submitted on this page will overwrite all existing
- files for application<b><?=CleanGet("application")?></b>.</p>
+ files for application<b><?php echo CleanGet("application")?></b>.</p>
- <p>The maximum file size in megabytes is: <?=$this->maxf?>.</p>
+ <p>The maximum file size in megabytes is: <?php echo $this->maxf?>.</p>
- <input type="hidden" name="MAX_FILE_SIZE" value="<?=$max?>000000">
+ <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $max?>000000">
<input type="FILE" name="f_single" id="f_single">
<br><br>
Modified: trunk/andro/application/instances_p.php
===================================================================
--- trunk/andro/application/instances_p.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/application/instances_p.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -64,11 +64,11 @@
?>
<h1>Instance Upgrade</h1>
- <p>Application: <?=$hApp?> </p>
- <p>Instance: <?=$hInst?> </p>
- <p>Current Version: <?=($hVer=='' ? '-none-' : $hVer)?> </p>
- <p>Latest Version Available: <?=($verx=='' ? '-none-' : $verx)?> </p>
- <?=$av?>
+ <p>Application: <?php echo $hApp?> </p>
+ <p>Instance: <?php echo $hInst?> </p>
+ <p>Current Version: <?php echo ($hVer=='' ? '-none-' : $hVer)?> </p>
+ <p>Latest Version Available: <?php echo ($verx=='' ? '-none-' : $verx)?> </p>
+ <?php echo $av?>
<p> </p>
<p>
<?php
@@ -79,7 +79,7 @@
download release code for this application, or you may
generate files out of your development code.
</p>
- <?=$hWarn?>
+ <?php echo $hWarn?>
<?php
return;
}
Added: trunk/andro/application/x6welcome.php
===================================================================
--- trunk/andro/application/x6welcome.php (rev 0)
+++ trunk/andro/application/x6welcome.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -0,0 +1,10 @@
+<?php
+class x6welcome extends androX6 {
+ function x6main() {
+ ?>
+ <h1>Hello World</h1>
+ <?php
+
+ }
+}
+?>
Property changes on: trunk/andro/application/x6welcome.php
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: trunk/andro/application/x_welcome.php
===================================================================
--- trunk/andro/application/x_welcome.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/application/x_welcome.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -58,7 +58,7 @@
font-weight: bolder; margin: 8px; padding: 0 8px 8px 8px">
<h2>New Version of Andromeda Available</h2>
- <p>Version <?=$latest?> is available at the Andromeda
+ <p>Version <?php echo $latest?> is available at the Andromeda
Sourceforge repository. <a href="?gp_page=a_pullsvn"
>Click Here </a> to go to the Pull Code From Subversion.
</div>
@@ -102,7 +102,7 @@
the database specification into the file
<br/>
<br/>
- <b><?=$dirs[0]['dir_pub']?>/test/application/test.dd.yaml</b>
+ <b><?php echo $dirs[0]['dir_pub']?>/test/application/test.dd.yaml</b>
<br/>
<br/>
@@ -111,10 +111,10 @@
more powerful than anything else out there,
and you will want learn the Andromeda way to
<a target="_blank" href=
-"http://www.andromeda-project.org/pages/cms/Defining+a+Database"
+"http://www.andromeda-project.org/pages/cms/database+programming.html"
>Define a Database</a>, and if you don't want to read the primer, you
can start with the <a target="_blank" href=
-"http://www.andromeda-project.org/pages/cms/The+Smallest+Possible+Andromeda+Specification"
+"http://www.andromeda-project.org/pages/cms/a+starter+database+specification.html"
>Sample Specification</a>.
<br/>
Modified: trunk/andro/lib/androHTMLFoot.php
===================================================================
--- trunk/andro/lib/androHTMLFoot.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/androHTMLFoot.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -33,7 +33,7 @@
?>
<script type="text/javascript">
$(document).ready(function() {
-<?=implode("\n",$jqdr)?>
+<?php echo implode("\n",$jqdr)?>
});
</script>
<?php
@@ -45,7 +45,7 @@
?>
<script type="text/javascript">
$(document).ready(function() {
- <?=$jqueryDocumentReady?>
+ <?php echo $jqueryDocumentReady?>
});
</script>
<?php
@@ -57,7 +57,7 @@
if($scriptend<>'') {
?>
<script type="text/javascript">
- <?=$scriptend?>
+ <?php echo $scriptend?>
</script>
<?php
}
@@ -82,7 +82,7 @@
<br/>
<div id="idiv2content" class="idiv2content"
style="margin: 10px; overflow-y: scroll;">
- <?=vgfGet('htmlHelp')?>
+ <?php echo vgfGet('htmlHelp')?>
</div>
</div>
<div id="dialogoverlay" style="display:none"></div>
Modified: trunk/andro/lib/androHTMLHead.php
===================================================================
--- trunk/andro/lib/androHTMLHead.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/androHTMLHead.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -197,7 +197,7 @@
if($styles<>'') {
?>
<style type="text/css">
- <?=$styles?>
+ <?php echo $styles?>
</style>
<?php
}
@@ -208,7 +208,7 @@
?>
<script language="javascript" type="text/javascript">
/* Script generated specifically for a page */
- <?=ElementOut("script");?>
+ <?php echo ElementOut("script");?>
</script>
<?php
}
Modified: trunk/andro/lib/androLib.php
===================================================================
--- trunk/andro/lib/androLib.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/androLib.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -5465,8 +5465,8 @@
}
?>
<ul class='right'>
- <?=$extra?>
- <li><a href='?st2logout=1'>Logout <?=SessionGet('UID')?></a></li>
+ <?php echo $extra?>
+ <li><a href='?st2logout=1'>Logout <?php echo SessionGet('UID')?></a></li>
</ul>
<?php
return false;
@@ -8616,8 +8616,8 @@
* !>example
* !>php
* <div class="moduletable">
-* <?=hLink('bolder','Link1','?explicit=links&parm=value')?>
-* <?=hLink('','Second Link','?second=example&parm=value')?>
+* <?php echo hLink('bolder','Link1','?explicit=links&parm=value')?>
+* <?php echo hLink('','Second Link','?second=example&parm=value')?>
* </div>
* !<
* !<
@@ -8659,7 +8659,7 @@
* !>example
* !>php
* <div>
-* You can jump straight to <?=hLinkPage('orders')?> from here.
+* You can jump straight to <?php echo hLinkPage('orders')?> from here.
* </div>
* !<
* !<
@@ -8717,7 +8717,7 @@
* !>php:Literal HTML should wrap HREFs
* <div id="someid">
* Please proceed to the
-* <a href="<?=hpHREF('?gp_page=somepage')?>">Ordering Page</a>
+* <a href="<?php echo hpHREF('?gp_page=somepage')?>">Ordering Page</a>
* so that we can process your order.
* </div>
* !<
@@ -9012,13 +9012,13 @@
<script type="text/javascript">
function fieldsSet() {
alert('Ran fieldsset');
- <?=$scr1?>
+ <?php echo $scr1?>
alert("end of fieldsSet");
}
function fieldsReset() {
alert('Ran FieldsReset');
- <?=$scr2?>
+ <?php echo $scr2?>
alert("end of fieldsReset");
}
</script>
@@ -9061,9 +9061,9 @@
$x=$id; //annoying jedit compiler warning
$style = vgfGet('x6') ? '' : 'style="height:100%"';
?>
- <form method="post" action="index.php" id="<?=$x?>"
+ <form method="post" action="index.php" id="<?php echo $x?>"
enctype="multipart/form-data"
- name="Form1" <?=$style?> >
+ name="Form1" <?php echo $style?> >
<?php
}
@@ -9207,14 +9207,14 @@
// Continue with original, the horizontal
if(LoggedIn()) {
?>
- <table border=0 <?=$hclass?> >
+ <table border=0 <?php echo $hclass?> >
<tr>
- <td align="center" <?=$hclass?>>
+ <td align="center" <?php echo $hclass?>>
<div style="height:3px"></div>
<span>
<span style="font-size: 1.2em;" class="login">
Welcome<br>
- <?=SessionGet('UID')?>!
+ <?php echo SessionGet('UID')?>!
</span>
<span>
<br><br>
@@ -9227,19 +9227,19 @@
else {
?>
<form action="?gp_page=x_login&gp_posted=1" method="post">
- <table <?=$hclass?>>
+ <table <?php echo $hclass?>>
<tr>
- <td <?=$hclass?>>User Login:</td>
+ <td <?php echo $hclass?>>User Login:</td>
</tr>
<tr>
- <td ><input type="text" name="loginUID" <?=$hValue?>
+ <td ><input type="text" name="loginUID" <?php echo $hValue?>
style="width:100%; background:ffffff;
color: #333333;
font-family: Geneva, Arial, Helvetica, san-serif;
font-size: 11px; Border: solid 1px1 #BABABA;"></td>
</tr>
<tr>
- <td <?=$hclass?>>Password:</td>
+ <td <?php echo $hclass?>>Password:</td>
</tr>
<tr>
<td ><input type="password" name="loginPWD" style="width:100%; background:ffffff; color: #333333; font-family: Geneva, Arial, Helvetica, san-serif; font-size: 11px; Border: solid 1px1 #BABABA;"></td>
@@ -9278,9 +9278,9 @@
<input type="submit" value=" Login " name="submit" />
</form>
<br/>
- <a href="<?=tmpPathInsert()?>?gp_page=x_password">Help with Password</a>
+ <a href="<?php echo tmpPathInsert()?>?gp_page=x_password">Help with Password</a>
<?php } else { ?>
- <a href="?st2logout=1">Logout <?=SessionGet("UID")?></a>
+ <a href="?st2logout=1">Logout <?php echo SessionGet("UID")?></a>
<?php } ?>
<?php
}
@@ -9323,7 +9323,7 @@
<input size=20 maxlength=30
id="object_for_f2"
name="object_for_f2"
- value="<?=gp('gp_command')?>"
+ value="<?php echo gp('gp_command')?>"
onclick="this.focus()"
onkeyup="DoCommand(event)"
tabindex="0">
@@ -9338,22 +9338,22 @@
>F6: New Window</a>
<?php } ?>
- <span style="color: red"><?=" ".vgfGet('command_error')?></span>
+ <span style="color: red"><?php echo " ".vgfGet('command_error')?></span>
<?php
if(gpExists('gp_gbt')) {
?>
- <a href="<?=gp('gp_gbrl')?>"><?=gp('gp_gbt')?></a>
+ <a href="<?php echo gp('gp_gbrl')?>"><?php echo gp('gp_gbt')?></a>
<?php
}
?>
</span>
<span style="padding-right: 10px">
- <?=vgfGet('html_buttonbar')?>
- <?=vgfGet('html_navbar')?>
+ <?php echo vgfGet('html_buttonbar')?>
+ <?php echo vgfGet('html_navbar')?>
<?php if(vgfGet('x4')===true) { ?>
- <?=ehLoginHorizontal()?>
+ <?php echo ehLoginHorizontal()?>
<?php } ?>
</span>
</div>
@@ -13480,9 +13480,9 @@
function ehFCKEditor($name,&$value) {
$x=$name;$x=$value; //annoying jedit compile warning
?>
- <textarea rows=15 cols=50 style="width: 100%" name="<?=$name?>" id="<?=$name?>"><?=$value?></textarea>
+ <textarea rows=15 cols=50 style="width: 100%" name="<?php echo $name?>" id="<?php echo $name?>"><?php echo $value?></textarea>
<script language="javascript">
- editor_generate('<?=$name?>'); // field, width, height
+ editor_generate('<?php echo $name?>'); // field, width, height
</script>
<?php
@@ -15952,7 +15952,7 @@
if ( !in_array( $file, $cssExcludes ) ) {
if(configGet('js_css_debug','Y')=='Y' || $force_immediate) {
?>
- <link rel='stylesheet' href='<?=tmpPathInsert().$file?>' />
+ <link rel='stylesheet' href='<?php echo tmpPathInsert().$file?>' />
<?php
}
else {
@@ -15991,7 +15991,7 @@
// Finally, put out the file
?>
<link rel='stylesheet'
- href='<?=tmpPathInsert()."clib/css-min-$md5.css"?>' />
+ href='<?php echo tmpPathInsert()."clib/css-min-$md5.css"?>' />
<?php
}
/**
@@ -16054,7 +16054,7 @@
if($js['comments']<>'') {
?>
<!--
- <?=$js['comments']?>
+ <?php echo $js['comments']?>
-->
<?php
}
@@ -16063,8 +16063,8 @@
$insert = $external ? '' : tmpPathInsert();
?>
<script type="text/javascript"
- src="<?=$insert.$js['file']?>" >
- <?=$js['comments']?>
+ src="<?php echo $insert.$js['file']?>" >
+ <?php echo $js['comments']?>
</script>
<?php
}
@@ -16113,7 +16113,7 @@
// Finally, put out the file
?>
<script type="text/javascript"
- src="<?=tmpPathInsert()."clib/js-min-$md5.js"?>" >
+ src="<?php echo tmpPathInsert()."clib/js-min-$md5.js"?>" >
</script>
<?php
}
Modified: trunk/andro/lib/androPage.php
===================================================================
--- trunk/andro/lib/androPage.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/androPage.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -156,7 +156,7 @@
function mainHelp() {
ob_start();
?>
- This is the <?=$this->yamlP2['options']['title']?> inquiry screen
+ This is the <?php echo $this->yamlP2['options']['title']?> inquiry screen
<br/><br/>
The input boxes accept a very flexible set of values,
you can enter ranges like a-e or 100-200, you can enter
Modified: trunk/andro/lib/androX4Menu.php
===================================================================
--- trunk/andro/lib/androX4Menu.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/androX4Menu.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -27,8 +27,8 @@
?>
<div id="x4Menu" class="x4Pane x4Menu">
<center>
- <h1><?=$h1?></h1>
- <?=$text?>
+ <h1><?php echo $h1?></h1>
+ <?php echo $text?>
</center>
<br/>
<?php
Modified: trunk/andro/lib/html_main_paypal_process.php
===================================================================
--- trunk/andro/lib/html_main_paypal_process.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/html_main_paypal_process.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -32,7 +32,7 @@
<html>
<head><title>::PHP PayPal::</title></head>
<body onLoad="document.paypal_form.submit();">
-<form method="post" name="paypal_form" action="<?=$paypal['url']?>">
+<form method="post" name="paypal_form" action="<?php echo $paypal['url']?>">
<?php
//show paypal hidden variables
Modified: trunk/andro/lib/html_popup.php
===================================================================
--- trunk/andro/lib/html_popup.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/html_popup.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -22,7 +22,7 @@
include("html_minheader.php");
?>
-<?=ehStandardContent()?>
+<?php echo ehStandardContent()?>
</body>
</html>
Modified: trunk/andro/lib/html_print.php
===================================================================
--- trunk/andro/lib/html_print.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/html_print.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -73,7 +73,7 @@
</head>
<body>
-<?=V("HTML")?>
+<?php echo V("HTML")?>
</body>
<script>window.print();</script>
Modified: trunk/andro/lib/html_print_display.php
===================================================================
--- trunk/andro/lib/html_print_display.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/html_print_display.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -24,16 +24,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title><?=ValueGet("PageTitle")?></title>
+ <title><?php echo ValueGet("PageTitle")?></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<style type="text/css">
/* Styles generated specifically for a page */
- <?=ElementOut("styles");?>
+ <?php echo ElementOut("styles");?>
</style>
<script language="javascript" type="text/javascript">
/* Script generated specifically for a page */
- <?=ElementOut("script");?>
+ <?php echo ElementOut("script");?>
</script>
</head>
@@ -52,11 +52,11 @@
<table border="0" cellpadding="0" cellspacing="0" class="topleftgray">
<tr>
<td align="center" class="topleftmargin">
- <?=ValueGet("PageTitle")?>
+ <?php echo ValueGet("PageTitle")?>
<br />
<img src="images/hrthing.jpg" width="200" height="2" border="0" alt="hrthing" />
<br />
- <?=date('M-d-Y g:ia',time())?> (NY Time)
+ <?php echo date('M-d-Y g:ia',time())?> (NY Time)
<br />
<?php
$uid = SessionGet("UID");
@@ -75,7 +75,7 @@
<tr>
<td class="leftmenumoduleposition">
- <?=ehStandardMenu()?>
+ <?php echo ehStandardMenu()?>
</td>
</tr>
@@ -98,7 +98,7 @@
<td class="btop-ttl-left"></td>
<td class="btop-ttl-mid">
<font class="nameoftable">
- <?=V("PageSubtitle")?>
+ <?php echo V("PageSubtitle")?>
</font></td>
<td class="btop-ttl-right"></td>
<td class="btop-filler"></td>
@@ -114,7 +114,7 @@
<td class="bmid-left"></td>
<!-- for 800x600 displays, use width=550 -->
<td class="bmid-center" colspan=5 width=720px valign="top">
- <?=$HTML_Message?>
+ <?php echo $HTML_Message?>
<?php
$HTML_nots = HTMLX_Notices();
@@ -126,7 +126,7 @@
<tr>
<td class="noticepic"></td>
<td class="noticetext">
- <?=$HTML_nots?>
+ <?php echo $HTML_nots?>
</td>
</tr>
</table>
@@ -143,7 +143,7 @@
<tr>
<td class="errorpic"></td>
<td class="errortext">
- <?=$HTML_errs?>
+ <?php echo $HTML_errs?>
</td>
</tr>
</table>
@@ -156,8 +156,8 @@
id="Form1"
name="Form1">
- <?=ValueGet("HTML")?>
- <?=ehHiddenAndData()?>
+ <?php echo ValueGet("HTML")?>
+ <?php echo ehHiddenAndData()?>
</form>
</td>
<td class="bmid-right"></td>
Modified: trunk/andro/lib/paypal_global_config.inc.php
===================================================================
--- trunk/andro/lib/paypal_global_config.inc.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/paypal_global_config.inc.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -214,55 +214,55 @@
?>
<!-- PayPal Configuration -->
-<input type="hidden" name="business" value="<?=$paypal['business']?>">
-<input type="hidden" name="cmd" value="<?=$paypal['cmd']?>">
-<input type="hidden" name="image_url" value="<?=$paypal['site_url'].$paypal['image_url']?>">
-<input type="hidden" name="return" value="<?=$paypal['site_url'].$paypal['success_url']?>">
-<input type="hidden" name="cancel_return" value="<?=$paypal['site_url'].$paypal['cancel_url']?>">
-<input type="hidden" name="notify_url" value="<?=$paypal['site_url'].$paypal['notify_url']?>">
-<input type="hidden" name="rm" value="<?=$paypal['return_method']?>">
-<input type="hidden" name="currency_code" value="<?=$paypal['currency_code']?>">
-<input type="hidden" name="lc" value="<?=$paypal['lc']?>">
-<input type="hidden" name="bn" value="<?=$paypal['bn']?>">
-<input type="hidden" name="cbt" value="<?=$paypal['continue_button_text']?>">
+<input type="hidden" name="business" value="<?php echo $paypal['business']?>">
+<input type="hidden" name="cmd" value="<?php echo $paypal['cmd']?>">
+<input type="hidden" name="image_url" value="<?php echo $paypal['site_url'].$paypal['image_url']?>">
+<input type="hidden" name="return" value="<?php echo $paypal['site_url'].$paypal['success_url']?>">
+<input type="hidden" name="cancel_return" value="<?php echo $paypal['site_url'].$paypal['cancel_url']?>">
+<input type="hidden" name="notify_url" value="<?php echo $paypal['site_url'].$paypal['notify_url']?>">
+<input type="hidden" name="rm" value="<?php echo $paypal['return_method']?>">
+<input type="hidden" name="currency_code" value="<?php echo $paypal['currency_code']?>">
+<input type="hidden" name="lc" value="<?php echo $paypal['lc']?>">
+<input type="hidden" name="bn" value="<?php echo $paypal['bn']?>">
+<input type="hidden" name="cbt" value="<?php echo $paypal['continue_button_text']?>">
<!-- Payment Page Information -->
-<input type="hidden" name="no_shipping" value="<?=$paypal['display_shipping_address']?>">
-<input type="hidden" name="no_note" value="<?=$paypal['display_comment']?>">
-<input type="hidden" name="cn" value="<?=$paypal['comment_header']?>">
-<input type="hidden" name="cs" value="<?=$paypal['background_color']?>">
+<input type="hidden" name="no_shipping" value="<?php echo $paypal['display_shipping_address']?>">
+<input type="hidden" name="no_note" value="<?php echo $paypal['display_comment']?>">
+<input type="hidden" name="cn" value="<?php echo $paypal['comment_header']?>">
+<input type="hidden" name="cs" value="<?php echo $paypal['background_color']?>">
<!-- Product Information -->
-<input type="hidden" name="item_name" value="<?=$paypal['item_name']?>">
-<input type="hidden" name="amount" value="<?=$paypal['amount']?>">
-<input type="hidden" name="quantity" value="<?=$paypal['quantity']?>">
-<input type="hidden" name="item_number" value="<?=$paypal['item_number']?>">
-<input type="hidden" name="undefined_quantity" value="<?=$paypal['edit_quantity']?>">
-<input type="hidden" name="on0" value="<?=$paypal['on0']?>">
-<input type="hidden" name="os0" value="<?=$paypal['os0']?>">
-<input type="hidden" name="on1" value="<?=$paypal['on1']?>">
-<input type="hidden" name="os1" value="<?=$paypal['os1']?>">
+<input type="hidden" name="item_name" value="<?php echo $paypal['item_name']?>">
+<input type="hidden" name="amount" value="<?php echo $paypal['amount']?>">
+<input type="hidden" name="quantity" value="<?php echo $paypal['quantity']?>">
+<input type="hidden" name="item_number" value="<?php echo $paypal['item_number']?>">
+<input type="hidden" name="undefined_quantity" value="<?php echo $paypal['edit_quantity']?>">
+<input type="hidden" name="on0" value="<?php echo $paypal['on0']?>">
+<input type="hidden" name="os0" value="<?php echo $paypal['os0']?>">
+<input type="hidden" name="on1" value="<?php echo $paypal['on1']?>">
+<input type="hidden" name="os1" value="<?php echo $paypal['os1']?>">
<!-- Shipping and Misc Information -->
-<input type="hidden" name="shipping" value="<?=$paypal['shipping_amount']?>">
-<input type="hidden" name="shipping2" value="<?=$paypal['shipping_amount_per_item']?>">
-<input type="hidden" name="handling" value="<?=$paypal['handling_amount']?>">
-<input type="hidden" name="tax" value="<?=$paypal['tax']?>">
-<input type="hidden" name="custom" value="<?=$paypal['custom_field']?>">
-<input type="hidden" name="invoice" value="<?=$paypal['invoice']?>">
+<input type="hidden" name="shipping" value="<?php echo $paypal['shipping_amount']?>">
+<input type="hidden" name="shipping2" value="<?php echo $paypal['shipping_amount_per_item']?>">
+<input type="hidden" name="handling" value="<?php echo $paypal['handling_amount']?>">
+<input type="hidden" name="tax" value="<?php echo $paypal['tax']?>">
+<input type="hidden" name="custom" value="<?php echo $paypal['custom_field']?>">
+<input type="hidden" name="invoice" value="<?php echo $paypal['invoice']?>">
<!-- Customer Information -->
-<input type="hidden" name="first_name" value="<?=$paypal['firstname']?>">
-<input type="hidden" name="last_name" value="<?=$paypal['lastname']?>">
-<input type="hidden" name="address1" value="<?=$paypal['address1']?>">
-<input type="hidden" name="address2" value="<?=$paypal['address2']?>">
-<input type="hidden" name="city" value="<?=$paypal['city']?>">
-<input type="hidden" name="state" value="<?=$paypal['state']?>">
-<input type="hidden" name="zip" value="<?=$paypal['zip']?>">
-<input type="hidden" name="email" value="<?=$paypal['email']?>">
-<input type="hidden" name="night_phone_a" value="<?=$paypal['phone_1']?>">
-<input type="hidden" name="night_phone_b" value="<?=$paypal['phone_2']?>">
-<input type="hidden" name="night_phone_c" value="<?=$paypal['phone_3']?>">
+<input type="hidden" name="first_name" value="<?php echo $paypal['firstname']?>">
+<input type="hidden" name="last_name" value="<?php echo $paypal['lastname']?>">
+<input type="hidden" name="address1" value="<?php echo $paypal['address1']?>">
+<input type="hidden" name="address2" value="<?php echo $paypal['address2']?>">
+<input type="hidden" name="city" value="<?php echo $paypal['city']?>">
+<input type="hidden" name="state" value="<?php echo $paypal['state']?>">
+<input type="hidden" name="zip" value="<?php echo $paypal['zip']?>">
+<input type="hidden" name="email" value="<?php echo $paypal['email']?>">
+<input type="hidden" name="night_phone_a" value="<?php echo $paypal['phone_1']?>">
+<input type="hidden" name="night_phone_b" value="<?php echo $paypal['phone_2']?>">
+<input type="hidden" name="night_phone_c" value="<?php echo $paypal['phone_3']?>">
<?php
}
Modified: trunk/andro/lib/reports.php
===================================================================
--- trunk/andro/lib/reports.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/reports.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -84,17 +84,17 @@
</script>
- <h1><?=$this->PageSubtitle?></h1>
+ <h1><?php echo $this->PageSubtitle?></h1>
<table cellpadding=0 cellspacing=0 width=100%
style="border-collapse:collapse">
<tr>
- <td height="40" valign=top><?=$this->h['ButtonBar']?>
+ <td height="40" valign=top><?php echo $this->h['ButtonBar']?>
</tr>
<tr>
<td>
<hr/>
<div class="x2menubar" id="x2tabbar" name="x2tabbar">
- <?=$this->ehTabbar(false);?>
+ <?php echo $this->ehTabbar(false);?>
<hr/>
</div>
</td>
@@ -102,7 +102,7 @@
<tr><td>
<tr>
<td class="x2_content" id="x2_content" name="x2_content">
- <?=$this->ehTab_Main()?>
+ <?php echo $this->ehTab_Main()?>
</td>
</tr>
</table>
@@ -229,18 +229,18 @@
<td>
Report Description:
<br>
- <input value="<?=$desc?>" name="ajx_description"
+ <input value="<?php echo $desc?>" name="ajx_description"
onblur="sndReq('&gp_ajax=repdesc&gp_new='+this.value)">
<br/><br/>
- Landscape: <input type="checkbox" <?=($flnd=='Y'?'CHECKED':'')?>
+ Landscape: <input type="checkbox" <?php echo ($flnd=='Y'?'CHECKED':'')?>
name="ajax_checkbox"
- onchange="andrax('<?=$h5?>)">
+ onchange="andrax('<?php echo $h5?>)">
</td>
<td>
- <?=$h3?><br><br>
- <?=$h4?><br><br>
- <?=$h4b?><br><br>
- <?=$h4c?><br><br>
+ <?php echo $h3?><br><br>
+ <?php echo $h4?><br><br>
+ <?php echo $h4b?><br><br>
+ <?php echo $h4c?><br><br>
</td>
</tr>
</table>
@@ -265,7 +265,7 @@
<td >
Tables Currently In this Report:
<div id="ajx_tablesrep" name="ajx_tablesrep">
- <?=$this->ehTablesRep(false)?>
+ <?php echo $this->ehTablesRep(false)?>
</div>
<td style="vertical-align: middle">
<input type="button" value="<< Add"
@@ -279,7 +279,7 @@
<td>
Tables That Can Be Added To This Report
<div id="ajx_tablesavl" name="ajx_tablesavl">
- <?=$this->ehTablesAvl(false)?>
+ <?php echo $this->ehTablesAvl(false)?>
</tr>
<?php
}
@@ -439,7 +439,7 @@
<br>
<br>
<div name="ajx_columnsrep" id="ajx_columnsrep">
- <?=$this->ehColumns(false)?>
+ <?php echo $this->ehColumns(false)?>
</div>
</td>
<td style="vertical-align: top; text-align: center; width: 80px">
@@ -454,7 +454,7 @@
<select size=20 style="width:220px"
name="sel_columnsavl" id="sel_columnsavl"
>
- <?=$hOpts?>
+ <?php echo $hOpts?>
</select>
</td>
</tr>
@@ -526,16 +526,16 @@
?>
<tr>
- <td><a href="javascript:sndReq('<?=$coldl?>')">delete</a>
- <td><a href="javascript:sndReq('<?=$colup?>')">up</a>
- <td><?="(".$row['tdesc'].") ".$row['cdesc']?>
- <td><a href="javascript:sndReq('<?=$coldn?>')">down</a>
- <td><input value="<?=$row['description']?>" size=10
- onblur="sndReq(<?=$hCC?>)">
- <td><input value="<?=$row['dispsize']?>" maxlength=3 size=3
- onblur="sndReq(<?=$hDS?>)">
- <td><input type=checkbox <?=$CHKD?> value="Y"
- onchange="javascript:sndReq('<?=$colst?>')">
+ <td><a href="javascript:sndReq('<?php echo $coldl?>')">delete</a>
+ <td><a href="javascript:sndReq('<?php echo $colup?>')">up</a>
+ <td><?php echo "(".$row['tdesc'].") ".$row['cdesc']?>
+ <td><a href="javascript:sndReq('<?php echo $coldn?>')">down</a>
+ <td><input value="<?php echo $row['description']?>" size=10
+ onblur="sndReq(<?php echo $hCC?>)">
+ <td><input value="<?php echo $row['dispsize']?>" maxlength=3 size=3
+ onblur="sndReq(<?php echo $hDS?>)">
+ <td><input type=checkbox <?php echo $CHKD?> value="Y"
+ onchange="javascript:sndReq('<?php echo $colst?>')">
<?php
}
echo "</table>";
@@ -808,7 +808,7 @@
cols=60
rows=5
style="border:1px solid gray"
- ><?=$repfilter?></textarea></td>
+ ><?php echo $repfilter?></textarea></td>
<td><a href="javascript:sndReq('&gp_ajax=filtrep&gp_val='+encodeURIComponent(ob('lev0').value))">Save</a>
</tr>
@@ -817,13 +817,13 @@
$js='&gp_ajax=filtlev&gp_skeylev='.$lev['skey'];
?>
<tr>
- <td valign=top><?=$lev['reportlevel']?></td>
+ <td valign=top><?php echo $lev['reportlevel']?></td>
<td><textarea
cols=60
rows=5
style="border:1px solid gray"
- onchange="sndReq('<?=$js?>&gp_val='+this.value)"
- ><?=$lev['repfilters']?></textarea></td>
+ onchange="sndReq('<?php echo $js?>&gp_val='+this.value)"
+ ><?php echo $lev['repfilters']?></textarea></td>
</tr>
<?php
}
@@ -845,9 +845,9 @@
$cols=SQL_Allrows($sql);
foreach($cols as $col) {
?>
- <tr><td><?=$col['description']?>
- <td><?=$col['table_id']?>
- <td><?=$col['column_id']?>
+ <tr><td><?php echo $col['description']?>
+ <td><?php echo $col['table_id']?>
+ <td><?php echo $col['column_id']?>
<?php
}
?>
@@ -890,13 +890,13 @@
}
?>
<tr>
- <td><?='('.$row['tdesc'].') '.$row['cdesc']?>
- <td><select onchange="sndReq(<?=$hSel1?>)"
- value="<?=$row['compoper']?>">
- <?=$hOpts?>
+ <td><?php echo '('.$row['tdesc'].') '.$row['cdesc']?>
+ <td><select onchange="sndReq(<?php echo $hSel1?>)"
+ value="<?php echo $row['compoper']?>">
+ <?php echo $hOpts?>
</select>
- <td><input onblur="sndReq(<?=$hSel2?>)"
- value="<?=$row['compval']?>"
+ <td><input onblur="sndReq(<?php echo $hSel2?>)"
+ value="<?php echo $row['compval']?>"
size=70 maxlength=100>
</tr>
<?php
@@ -911,7 +911,7 @@
<td class="dhead" style="width:10%">Operator
<td class="dhead" style="width:65%">Value
</tr>
- <?=$hHTML?>
+ <?php echo $hHTML?>
</table>
<?php
}
Modified: trunk/andro/lib/x6menu.php
===================================================================
--- trunk/andro/lib/x6menu.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/x6menu.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -203,8 +203,8 @@
}
// Initialize the first one
- var x6page_prior = '<?=gp('x6page_prior')?>';
- var x6mod_prior = '<?=gp('x6mod_prior')?>';
+ var x6page_prior = '<?php echo gp('x6page_prior')?>';
+ var x6mod_prior = '<?php echo gp('x6mod_prior')?>';
if(x6mod_prior=='') {
$("#x6menu_left div:first").click();
//self.clicked($("#x6menu_left div:first")[0].id);
Modified: trunk/andro/lib/x6skinJob.php
===================================================================
--- trunk/andro/lib/x6skinJob.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/x6skinJob.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -266,8 +266,8 @@
?>
/* ==================================================== *\
* Andromeda Generated CSS file
- * Generated: <?=date('r',time())."\n"?>
- * Skin, color, size: <?="$skin, $color, $size\n"?>
+ * Generated: <?php echo date('r',time())."\n"?>
+ * Skin, color, size: <?php echo "$skin, $color, $size\n"?>
\* ==================================================== */
<?php
echo "\n";
Modified: trunk/andro/lib/x6skinShow.php
===================================================================
--- trunk/andro/lib/x6skinShow.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/x6skinShow.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -4,7 +4,7 @@
?>
<h1>Skin Details</h1>
- <p><b>Current Skin:</b><?=arr($_COOKIE,'x6skin','win2k.gray.1024')?>
+ <p><b>Current Skin:</b><?php echo arr($_COOKIE,'x6skin','win2k.gray.1024')?>
</p>
<?php
if(isset($GLOBALS['AG']['x6skin'])) {
Modified: trunk/andro/lib/x6useroptions.php
===================================================================
--- trunk/andro/lib/x6useroptions.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/x6useroptions.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -40,7 +40,7 @@
}
</script>
<h2>Skin Selection</h2>
- Skin: <?=$select->render()?>
+ Skin: <?php echo $select->render()?>
<?php
$tab1->setHtml(ob_get_clean());
Modified: trunk/andro/lib/x_docview.php
===================================================================
--- trunk/andro/lib/x_docview.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/x_docview.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -237,8 +237,8 @@
echo $hpn;
?>
<hr>
- Page last modified <?=date('r',dEnsureTS($row['ts_upd']))?> by
- <?=$row['uid_upd']?><br><br>
+ Page last modified <?php echo date('r',dEnsureTS($row['ts_upd']))?> by
+ <?php echo $row['uid_upd']?><br><br>
<?php
}
Modified: trunk/andro/lib/x_email.php
===================================================================
--- trunk/andro/lib/x_email.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/x_email.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -79,13 +79,13 @@
and then click on the [SEND] button.</p>
<table>
- <?=$this->HTML_INPUTS($GLOBALS["AG"]["tables"]["adm_emails"],$em,"ins",true);?>
+ <?php echo $this->HTML_INPUTS($GLOBALS["AG"]["tables"]["adm_emails"],$em,"ins",true);?>
</table>
<br>
<br>
- <?=HTMLE_A_JS("formSubmit()","Send Email Now");?>
+ <?php echo HTMLE_A_JS("formSubmit()","Send Email Now");?>
<?php
}
}
Modified: trunk/andro/lib/x_emailblast.php
===================================================================
--- trunk/andro/lib/x_emailblast.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/x_emailblast.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -103,13 +103,13 @@
<p>Subject:
<input size=50 maxlength=50 name="txt_subject"
- value="<?=CleanGet('txt_subject','',false)?>">
+ value="<?php echo CleanGet('txt_subject','',false)?>">
</input>
</p>
Email Text:<br>
<textarea cols=70 rows=20 name="txt_email"
- ><?=CleanGet('txt_email','',false)?></textarea>
+ ><?php echo CleanGet('txt_email','',false)?></textarea>
<h2>Recipients</h2>
<?php
Modified: trunk/andro/lib/x_import.php
===================================================================
--- trunk/andro/lib/x_import.php 2009-01-30 03:29:18 UTC (rev 1195)
+++ trunk/andro/lib/x_import.php 2009-01-30 14:32:12 UTC (rev 1196)
@@ -70,9 +70,9 @@
?>
<h1>Table Import</h1>
- <p><b>Destination Table:</b><?=hLinkPage('',$tid)?>
+ <p><b>Destination Table:</b><?php echo hLinkPage('',$tid)?>
</p>
- <p><b>Table Name in Database:</b> <?=$tid?>.
+ <p><b>Table Name in Database:</b> <?php echo $tid?>.
</p>
<p>This is standardized import program that can accept file
uploads in the popular "CSV" format. The first row is expected
@@ -102,7 +102,7 @@
?>
<h2>File Upload</h2>
<p>Please upload a file to process.
- <p><?=hFileUpload();?>
+ <p><?php echo hFileUpload();?>
<?php
}
}
@@ -180,9 +180,9 @@
? '<tr class="hilite">'
: '<tr>';
?>
- <td><?=$map['importmap']?>
- <td><a href="javascript:andrax('?<?=$hp1?>')">Select</a>
- <td><a href="javascript:andrax('?<?=$hp2?>')">Delete</a>
+ <td><?php echo $map['importmap']?>
+ <td><a href="javascript:andrax('?<?php echo $hp1?>')">Select</a>
+ <td><a href="javascript:andrax('?<?php echo $hp2?...
[truncated message content] |
|
From: <ken...@us...> - 2009-01-30 03:29:20
|
Revision: 1195
http://andro.svn.sourceforge.net/andro/?rev=1195&view=rev
Author: kendowns
Date: 2009-01-30 03:29:18 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
Added Paths:
-----------
apps/finance/application/finance.dd.yaml
Copied: apps/finance/application/finance.dd.yaml (from rev 1194, apps/finance/trunk/application/finance.dd.yaml)
===================================================================
--- apps/finance/application/finance.dd.yaml (rev 0)
+++ apps/finance/application/finance.dd.yaml 2009-01-30 03:29:18 UTC (rev 1195)
@@ -0,0 +1,421 @@
+# =================================================================
+# (C) Copyright 2005 by Secure Data Software, Inc.
+#
+# Purpose: This the Data Dictionary for the FINANCE application
+# FINANCE is an Andromeda application
+#
+# FINANCE is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# FINANCE is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Andromeda; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301 USA
+# or visit http://www.gnu.org/licenses/gpl.html
+# ==================================================================
+
+# ==================================================================
+#
+# MODULES AND GROUPS
+#
+# ==================================================================
+group ordersadmin:
+ description: Orders Power Users
+ module ordering:
+ permsel: "Y"
+ permins: "Y"
+ permupd: "Y"
+ permdel: "Y"
+
+module ordering:
+ description: Orders
+ uisort: 100
+
+group gladmin:
+ description: GL Power Users
+ module gl:
+ permsel: "Y"
+ permins: "Y"
+ permupd: "Y"
+ permdel: "Y"
+
+module gl:
+ description: Ledger
+ uisort: 500
+
+# ==================================================================
+#
+# ORDERS MODULE
+#
+# ==================================================================
+table orders:
+ module: ordering
+ description: Orders
+ uisort: 100
+
+ column recnum_ord:
+ suffix: _ord
+ description: Order
+ uisearch: "Y"
+ primary_key: "Y"
+ foreign_key customers:
+ uisearch: "Y"
+ column date:
+ uisearch: "Y"
+
+ column description:
+ description: Company Name
+ uisearch: "Y"
+ auto: fetch,customers.description
+ column first_name:
+ auto: fetch,customers.first_name
+ column last_name:
+ auto: fetch,customers.last_name
+ column add1:
+ auto: fetch,customers.add1
+ column add2:
+ auto: fetch,customers.add2
+ column city:
+ auto: fetch,customers.city
+ column state:
+ auto: fetch,customers.state
+ column zip9:
+ auto: fetch,customers.zip9
+ foreign_key custtypes:
+ column custtype:
+ auto: fetch,customers.custtype
+ column pct99_discount:
+ suffix: _discount
+ auto: fetch,custtypes.pct99_discount
+
+ column amt_retail:
+ suffix: _retail
+ description: Order Retail
+ auto: sum,orderlines.amt_retail
+ column amt_discount:
+ suffix: _discount
+ description: Total Discount
+ auto: sum,orderlines.amt_discount
+ column amt_net:
+ suffix: _net
+ description: Order Net
+ auto: sum,orderlines.amt_net
+ foreign_key taxauths:
+ column taxauth:
+ auto: fetchdef,customers.taxauth
+ column taxpct:
+ prefix: tax
+ description: Tax Percent
+ column amt_tax:
+ suffix: _tax
+ description: Tax Amount
+ auto: sum,orderlines.amt_tax
+ column amt_due:
+ suffix: _due
+ description: Amount Due
+ chain calc:
+ test 00:
+ return: @amt_net + @amt_tax
+ #column amt_payments:
+ # suffix: _payments
+ # description: Lifetime Payments
+ # auto: sum,payments.amt_paid
+ #column amt_balance:
+ # suffix: _balance
+ # description: Current Balance
+ # chain calc:
+ # test 00:
+ # return: @amt_due - @amt_payments
+
+
+table orderlines:
+ module: ordering
+ uisort: 110
+ nomenu: "Y"
+ x6childwrites: detail
+
+ column recnum_ol:
+ suffix: _ol
+ description: Order Line
+ primary_key: "Y"
+ foreign_key orders:
+
+ foreign_key items:
+ uisearch: "Y"
+ column price:
+ auto: fetch,items.price
+ uisearch: "Y"
+ column flag_taxable:
+ description: Taxable
+ suffix: _taxable
+ auto: fetch,items.flag_taxable
+ column qty:
+ uisearch: "Y"
+ column amt_retail:
+ suffix: _retail
+ description: Retail
+ chain calc:
+ test 00:
+ return: @price * @qty
+ column pct99_discount:
+ suffix: _discount
+ auto: distribute,orders.pct99_discount
+ column amt_discount:
+ suffix: _discount
+ description: Discount
+ chain calc:
+ test 00:
+ return: @amt_retail * @pct99_discount .01
+ column amt_net:
+ suffix: _net
+ description: Order Net
+ chain calc:
+ test 00:
+ return: @amt_retail - @amt_discount
+ column taxauth:
+ auto: distribute,orders.taxauth
+ column taxpct:
+ prefix: tax
+ description: Tax Percent
+ auto: distribute,orders.taxpct
+ column amt_tax:
+ suffix: _tax
+ description: Tax Amount
+ chain calc:
+ test 00:
+ compare: @flag_taxable = Y
+ return: @amt_net * @taxpct .01
+ test 01:
+ return: 0
+ column amt_due:
+ suffix: _due
+ description: Line Final
+ chain calc:
+ test 00:
+ return: @amt_net + @amt_tax
+
+
+
+#
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+#
+
+column customer:
+ type_id: int
+ automation_id: sequence
+ description: Customer
+table customers:
+ module: ordering
+ description: Customers
+ uisort: 200
+ spaceafter: "Y"
+
+ column customer:
+ primary_key: "Y"
+ uisearch: "Y"
+ column description:
+ description: Company Name
+ uisearch: "Y"
+ column first_name:
+ uisearch: "Y"
+ column last_name:
+ uisearch: "Y"
+ column add1:
+ column add2:
+ column city:
+ foreign_key states:
+ allow_empty: "Y"
+ column zip9:
+ foreign_key custtypes:
+ allow_empty: "Y"
+ foreign_key taxauths:
+
+ column amt_retail:
+ suffix: _retail
+ description: Lifetime Retail
+ auto: sum,orders.amt_retail
+ column amt_discount:
+ suffix: _discount
+ description: Lifetime Discount
+ auto: sum,orders.amt_discount
+ column amt_net:
+ suffix: _net
+ description: Lifetime Net Sales
+ auto: sum,orders.amt_net
+ column amt_payments:
+ suffix: _payments
+ description: Lifetime Payments
+ #auto: sum,orders.amt_paid
+ column amt_balance:
+ suffix: _balance
+ description: Current Balance
+ chain calc:
+ test 00:
+ return: @amt_net - @amt_payments
+
+
+#
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+#
+column sku:
+ type_id: vchar
+ colprec: 15
+ description: SKU
+table items:
+ module: ordering
+ uisort: 300
+ description: Items
+ spaceafter: "Y"
+ x6profile: twosides
+
+
+ column sku:
+ primary_key: "Y"
+ uisearch: "Y"
+ column description:
+ uisearch: "Y"
+ column flag_taxable:
+ suffix: _taxable
+ description: Taxable
+ uisearch: "Y"
+ column price:
+ description: Price
+ uisearch: "Y"
+
+#
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+#
+
+column custtype:
+ type_id: vchar
+ colprec: 8
+ description: Customer Type
+
+table custtypes:
+ module: ordering
+ uisort: 900
+ x6profile: grid
+ description: Customer Types
+
+ column custtype:
+ primary_key: "Y"
+ uisearch: "Y"
+ column description:
+ uisearch: "Y"
+ column pct99_discount:
+ suffix: _discount
+ description: Standard Discount
+ uisearch: "Y"
+ column cnt_customers:
+ suffix: _customers
+ auto: count,customers.skey
+ uisearch: "Y"
+
+column taxauth:
+ type_id: vchar
+ colprec: 11
+ description: Tax Authority
+table taxauths:
+ module: ordering
+ uisort: 910
+ x6profile: grid
+ description: Tax Authorities
+
+ column taxauth:
+ primary_key: "Y"
+ uisearch: "Y"
+ column description:
+ uisearch: "Y"
+ column taxpct:
+ prefix: tax
+ description: Tax Percent
+ uisearch: "Y"
+ column cnt_customers:
+ suffix: _customers
+ uisearch: "Y"
+ description: Customers
+ auto: count,customers.skey
+ column cnt_orders:
+ suffix: _orders
+ uisearch: "Y"
+ description: Orders
+ auto: count,orders.skey
+
+
+
+
+# ==================================================================
+#
+# GL MODULE
+#
+# ==================================================================
+column glaccount:
+ type_id: vchar
+ colprec: 10
+ description: GL Account
+
+table glaccounts:
+ description: Chart of Accounts
+ module: gl
+ uisort: 100
+ x6profile: grid
+
+ column glaccount:
+ primary_key: "Y"
+ uisearch: "Y"
+ foreign_key glactypes:
+ uisearch: "Y"
+ column description:
+ uisearch: "Y"
+
+content glaccounts:
+ columns: [ glaccount, glactype, description ]
+ values:
+ - [ 10000, A, Cash ]
+ - [ 20000, A, Accounts Receivable ]
+ - [ 30000, L, Accounts Payable ]
+ - [ 40000, Q, Shareholder Equity ]
+ - [ 40010, Q, Accumulated Profit ]
+ - [ 50000, I, Trade Income ]
+ - [ 60000, E, Unspecified Expense ]
+
+column glactype:
+ type_id: char
+ colprec: 1
+ description: A/C Type Code
+table glactypes:
+ description: Account Types
+ module: gl
+ uisort: 900
+ x6profile: grid
+ x6all: "Y"
+
+ group gladmin:
+ permins: "N"
+ permupd: "N"
+ permdel: "N"
+
+ column glactype:
+ primary_key: "Y"
+ uisearch: "Y"
+ column description:
+ uisearch: "Y"
+ column sequence:
+ uisearch: "Y"
+
+content glactypes:
+ columns: [ glactype, description, sequence ]
+ value:
+ - [ A, Asset , 1 ]
+ - [ L, Liability, 2 ]
+ - [ Q, Equity , 3 ]
+ - [ I, Income , 4 ]
+ - [ E, Expense , 5 ]
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-01-30 03:29:03
|
Revision: 1194
http://andro.svn.sourceforge.net/andro/?rev=1194&view=rev
Author: kendowns
Date: 2009-01-30 03:29:00 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
Added Paths:
-----------
apps/finance/application/applib.php
Copied: apps/finance/application/applib.php (from rev 1193, apps/finance/trunk/application/applib.php)
===================================================================
--- apps/finance/application/applib.php (rev 0)
+++ apps/finance/application/applib.php 2009-01-30 03:29:00 UTC (rev 1194)
@@ -0,0 +1,27 @@
+<?php
+# =================================================================
+# (C) Copyright 2005 by Secure Data Software, Inc.
+#
+# Purpose: This the global library for the FINANCE application
+# FINANCE is an Andromeda application
+#
+# FINANCE is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# FINANCE is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Andromeda; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301 USA
+# or visit http://www.gnu.org/licenses/gpl.html
+# ==================================================================
+function app_template() {
+ return 'x6';
+}
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-01-30 03:28:20
|
Revision: 1193
http://andro.svn.sourceforge.net/andro/?rev=1193&view=rev
Author: kendowns
Date: 2009-01-30 03:28:17 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
Removed Paths:
-------------
apps/finance/application/applib.php
apps/finance/application/finance.dd.yaml
Deleted: apps/finance/application/applib.php
===================================================================
--- apps/finance/application/applib.php 2009-01-30 03:09:33 UTC (rev 1192)
+++ apps/finance/application/applib.php 2009-01-30 03:28:17 UTC (rev 1193)
@@ -1,27 +0,0 @@
-<?php
-# =================================================================
-# (C) Copyright 2005 by Secure Data Software, Inc.
-#
-# Purpose: This the global library for the FINANCE application
-# FINANCE is an Andromeda application
-#
-# FINANCE is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# FINANCE is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Andromeda; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor,
-# Boston, MA 02110-1301 USA
-# or visit http://www.gnu.org/licenses/gpl.html
-# ==================================================================
-function app_template() {
- return 'x6';
-}
-?>
Deleted: apps/finance/application/finance.dd.yaml
===================================================================
--- apps/finance/application/finance.dd.yaml 2009-01-30 03:09:33 UTC (rev 1192)
+++ apps/finance/application/finance.dd.yaml 2009-01-30 03:28:17 UTC (rev 1193)
@@ -1,416 +0,0 @@
-# =================================================================
-# (C) Copyright 2005 by Secure Data Software, Inc.
-#
-# Purpose: This the Data Dictionary for the FINANCE application
-# FINANCE is an Andromeda application
-#
-# FINANCE is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# FINANCE is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Andromeda; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor,
-# Boston, MA 02110-1301 USA
-# or visit http://www.gnu.org/licenses/gpl.html
-# ==================================================================
-
-# ==================================================================
-#
-# MODULES AND GROUPS
-#
-# ==================================================================
-group ordersadmin:
- description: Orders Power Users
- module ordering:
- permsel: "Y"
- permins: "Y"
- permupd: "Y"
- permdel: "Y"
-
-module ordering:
- description: Orders
- uisort: 100
-
-group gladmin:
- description: GL Power Users
- module gl:
- permsel: "Y"
- permins: "Y"
- permupd: "Y"
- permdel: "Y"
-
-module gl:
- description: Ledger
- uisort: 500
-
-# ==================================================================
-#
-# ORDERS MODULE
-#
-# ==================================================================
-table orders:
- module: ordering
- description: Orders
- uisort: 100
-
- column recnum_ord:
- suffix: _ord
- description: Order
- uisearch: "Y"
- primary_key: "Y"
- foreign_key customers:
- uisearch: "Y"
- column date:
- uisearch: "Y"
-
- column description:
- description: Company Name
- uisearch: "Y"
- auto: fetch,customers.description
- column first_name:
- auto: fetch,customers.first_name
- column last_name:
- auto: fetch,customers.last_name
- column add1:
- auto: fetch,customers.add1
- column add2:
- auto: fetch,customers.add2
- column city:
- auto: fetch,customers.city
- column state:
- auto: fetch,customers.state
- column zip9:
- auto: fetch,customers.zip9
- foreign_key custtypes:
- column custtype:
- auto: fetch,customers.custtype
- column pct99_discount:
- suffix: _discount
- auto: fetch,custtypes.pct99_discount
-
- column amt_retail:
- suffix: _retail
- description: Order Retail
- auto: sum,orderlines.amt_retail
- column amt_discount:
- suffix: _discount
- description: Total Discount
- auto: sum,orderlines.amt_discount
- column amt_net:
- suffix: _net
- description: Order Net
- auto: sum,orderlines.amt_net
- foreign_key taxauths:
- column taxauth:
- auto: fetchdef,customers.taxauth
- column taxpct:
- prefix: tax
- description: Tax Percent
- column amt_tax:
- suffix: _tax
- description: Tax Amount
- auto: sum,orderlines.amt_tax
- column amt_due:
- suffix: _due
- description: Amount Due
- chain calc:
- test 00:
- return: @amt_net + @amt_tax
- #column amt_payments:
- # suffix: _payments
- # description: Lifetime Payments
- # auto: sum,payments.amt_paid
- #column amt_balance:
- # suffix: _balance
- # description: Current Balance
- # chain calc:
- # test 00:
- # return: @amt_due - @amt_payments
-
-
-table orderlines:
- module: ordering
- uisort: 110
- nomenu: "Y"
-
- column recnum_ol:
- suffix: _ol
- description: Order Line
- primary_key: "Y"
- foreign_key orders:
-
- foreign_key items:
- uisearch: "Y"
- column price:
- auto: fetch,items.price
- uisearch: "Y"
- column flag_taxable:
- description: Taxable
- suffix: _taxable
- auto: fetch,items.flag_taxable
- column qty:
- uisearch: "Y"
- column amt_retail:
- suffix: _retail
- description: Retail
- chain calc:
- test 00:
- return: @price * @qty
- column pct99_discount:
- suffix: _discount
- auto: distribute,orders.pct99_discount
- column amt_discount:
- suffix: _discount
- description: Discount
- chain calc:
- test 00:
- return: @amt_retail * @pct99_discount .01
- column amt_net:
- suffix: _net
- description: Order Net
- chain calc:
- test 00:
- return: @amt_retail - @amt_discount
- column taxauth:
- auto: distribute,orders.taxauth
- column taxpct:
- prefix: tax
- description: Tax Percent
- auto: distribute,orders.taxpct
- column amt_tax:
- suffix: _tax
- description: Tax Amount
- chain calc:
- test 00:
- compare: @flag_taxable = Y
- return: @amt_net * @taxpct .01
- test 01:
- return: 0
- column amt_due:
- suffix: _due
- description: Line Final
- chain calc:
- test 00:
- return: @amt_net + @amt_tax
-
-
-
-#
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-#
-
-column customer:
- type_id: int
- automation_id: sequence
- description: Customer
-table customers:
- module: ordering
- description: Customers
- uisort: 200
- spaceafter: "Y"
-
- column customer:
- primary_key: "Y"
- uisearch: "Y"
- column description:
- description: Company Name
- uisearch: "Y"
- column first_name:
- uisearch: "Y"
- column last_name:
- uisearch: "Y"
- column add1:
- column add2:
- column city:
- foreign_key states:
- allow_empty: "Y"
- column zip9:
- foreign_key custtypes:
- allow_empty: "Y"
- foreign_key taxauths:
-
- column amt_retail:
- suffix: _retail
- description: Lifetime Retail
- auto: sum,orders.amt_retail
- column amt_discount:
- suffix: _discount
- description: Lifetime Discount
- auto: sum,orders.amt_discount
- column amt_net:
- suffix: _net
- description: Lifetime Net Sales
- auto: sum,orders.amt_net
- column amt_payments:
- suffix: _payments
- description: Lifetime Payments
- #auto: sum,orders.amt_paid
- column amt_balance:
- suffix: _balance
- description: Current Balance
- chain calc:
- test 00:
- return: @amt_net - @amt_payments
-
-
-#
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-#
-column sku:
- type_id: vchar
- colprec: 15
- description: SKU
-table items:
- module: ordering
- uisort: 300
- description: Items
- spaceafter: "Y"
-
-
- column sku:
- primary_key: "Y"
- uisearch: "Y"
- column description:
- uisearch: "Y"
- column flag_taxable:
- suffix: _taxable
- description: Taxable
- uisearch: "Y"
- column price:
- description: Price
- uisearch: "Y"
-
-#
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-#
-
-column custtype:
- type_id: vchar
- colprec: 8
- description: Customer Type
-
-table custtypes:
- module: ordering
- uisort: 900
- x6profile: tabDiv
- description: Customer Types
-
- column custtype:
- primary_key: "Y"
- uisearch: "Y"
- column description:
- uisearch: "Y"
- column pct99_discount:
- suffix: _discount
- description: Standard Discount
- column cnt_customers:
- suffix: _customers
- auto: count,customers.skey
-
-column taxauth:
- type_id: vchar
- colprec: 11
- description: Tax Authority
-table taxauths:
- module: ordering
- uisort: 910
- x6profile: tabDiv
- description: Tax Authorities
-
- column taxauth:
- primary_key: "Y"
- uisearch: "Y"
- column description:
- uisearch: "Y"
- column taxpct:
- prefix: tax
- description: Tax Percent
- uisearch: "Y"
- column cnt_customers:
- suffix: _customers
- uisearch: "Y"
- description: Customers
- auto: count,customers.skey
- column cnt_orders:
- suffix: _orders
- uisearch: "Y"
- description: Orders
- auto: count,orders.skey
-
-
-
-
-# ==================================================================
-#
-# GL MODULE
-#
-# ==================================================================
-column glaccount:
- type_id: vchar
- colprec: 10
- description: GL Account
-
-table glaccounts:
- description: Chart of Accounts
- module: gl
- uisort: 100
- x6profile: tabdiv
-
- column glaccount:
- primary_key: "Y"
- uisearch: "Y"
- foreign_key glactypes:
- uisearch: "Y"
- column description:
- uisearch: "Y"
-
-content glaccounts:
- columns: [ glaccount, glactype, description ]
- values:
- - [ 10000, A, Cash ]
- - [ 20000, A, Accounts Receivable ]
- - [ 30000, L, Accounts Payable ]
- - [ 40000, Q, Shareholder Equity ]
- - [ 40010, Q, Accumulated Profit ]
- - [ 50000, I, Trade Income ]
- - [ 60000, E, Unspecified Expense ]
-
-column glactype:
- type_id: char
- colprec: 1
- description: A/C Type Code
-table glactypes:
- description: Account Types
- module: gl
- uisort: 900
- x6profile: tabdiv
- x6all: "Y"
-
- group gladmin:
- permins: "N"
- permupd: "N"
- permdel: "N"
-
- column glactype:
- primary_key: "Y"
- uisearch: "Y"
- column description:
- uisearch: "Y"
- column sequence:
- uisearch: "Y"
-
-content glactypes:
- columns: [ glactype, description, sequence ]
- value:
- - [ A, Asset , 1 ]
- - [ L, Liability, 2 ]
- - [ Q, Equity , 3 ]
- - [ I, Income , 4 ]
- - [ E, Expense , 5 ]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-01-30 03:09:36
|
Revision: 1192
http://andro.svn.sourceforge.net/andro/?rev=1192&view=rev
Author: kendowns
Date: 2009-01-30 03:09:33 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
small correction
Added Paths:
-----------
apps/finance/releases/2009.01.29.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-01-30 03:08:46
|
Revision: 1191
http://andro.svn.sourceforge.net/andro/?rev=1191&view=rev
Author: kendowns
Date: 2009-01-30 03:08:44 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
The error trapping showed me I missed something...
Modified Paths:
--------------
apps/finance/trunk/application/finance.dd.yaml
Modified: apps/finance/trunk/application/finance.dd.yaml
===================================================================
--- apps/finance/trunk/application/finance.dd.yaml 2009-01-30 03:06:26 UTC (rev 1190)
+++ apps/finance/trunk/application/finance.dd.yaml 2009-01-30 03:08:44 UTC (rev 1191)
@@ -139,6 +139,7 @@
module: ordering
uisort: 110
nomenu: "Y"
+ x6childwrites: detail
column recnum_ol:
suffix: _ol
@@ -148,7 +149,6 @@
foreign_key items:
uisearch: "Y"
- x6childwrites: detail
column price:
auto: fetch,items.price
uisearch: "Y"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-01-30 03:06:32
|
Revision: 1190
http://andro.svn.sourceforge.net/andro/?rev=1190&view=rev
Author: kendowns
Date: 2009-01-30 03:06:26 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
made order lines editable in 'detail' mode
Added Paths:
-----------
apps/finance/releases/2009.01.29/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-01-30 03:05:12
|
Revision: 1189
http://andro.svn.sourceforge.net/andro/?rev=1189&view=rev
Author: kendowns
Date: 2009-01-30 03:05:03 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
Modified Paths:
--------------
apps/finance/trunk/application/finance.dd.yaml
Modified: apps/finance/trunk/application/finance.dd.yaml
===================================================================
--- apps/finance/trunk/application/finance.dd.yaml 2009-01-30 02:43:09 UTC (rev 1188)
+++ apps/finance/trunk/application/finance.dd.yaml 2009-01-30 03:05:03 UTC (rev 1189)
@@ -148,6 +148,7 @@
foreign_key items:
uisearch: "Y"
+ x6childwrites: detail
column price:
auto: fetch,items.price
uisearch: "Y"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-01-30 02:43:18
|
Revision: 1188
http://andro.svn.sourceforge.net/andro/?rev=1188&view=rev
Author: kendowns
Date: 2009-01-30 02:43:09 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
Time for feature freeze!
Added Paths:
-----------
releases/2009.01.29/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
