tutos-commits Mailing List for TUTOS

Revision: 1341
          http://sourceforge.net/p/tutos/code/1341
Author:   gokohnert
Date:     2021-03-12 14:02:29 +0000 (Fri, 12 Mar 2021)
Log Message:
-----------
fix stc problem

Modified Paths:
--------------
    trunk/php/stc/mtable.pinc
    trunk/php/stc/stc.pinc

Modified: trunk/php/stc/mtable.pinc
===================================================================
--- trunk/php/stc/mtable.pinc	2021-02-02 15:56:41 UTC (rev 1340)
+++ trunk/php/stc/mtable.pinc	2021-03-12 14:02:29 UTC (rev 1341)
@@ -33,15 +33,15 @@
     );
 
 
-$table['stc_states'][name]         = 'stc_state';
-$table['stc_states'][Desc]         = 'TUTOS STC State';
-$table['stc_states']['id']         = array(type => 'ID_TYPE',             constraints => 'PK',  Desc => 'stc state ID');
-$table['stc_states']['stc_id']     = array(type => 'ID_TYPE',             constraints => 'NN',  Desc => 'parent ID');
-$table['stc_states']['stc_state']  = array(type => 'ID_TYPE',             constraints => '',    Desc => 'state ID');
-$table['stc_states']['color']      = array(type => 'VARCHAR', size => 30, constraints => '',    Desc => 'color for visualization');
-$table['stc_states']['lang_array'] = array(type => 'VARCHAR', size => 30, constraints => '',    Desc => 'arrayname with translation');
-$table['stc_states']['creator']    = array(type => 'ID_TYPE',             constraints => '',    Desc => 'creator ID');
-$table['stc_states']['creation']   = array(type => 'TS_TYPE',             constraints => '',    Desc => 'creation date');
+$table['stcstate'][name]         = 'stc_state';
+$table['stcstate'][Desc]         = 'TUTOS STC State';
+$table['stcstate']['id']         = array(type => 'ID_TYPE',             constraints => 'PK',  Desc => 'stc state ID');
+$table['stcstate']['stc_id']     = array(type => 'ID_TYPE',             constraints => 'NN',  Desc => 'parent ID');
+$table['stcstate']['stc_state']  = array(type => 'ID_TYPE',             constraints => '',    Desc => 'state ID');
+$table['stcstate']['color']      = array(type => 'VARCHAR', size => 30, constraints => '',    Desc => 'color for visualization');
+$table['stcstate']['lang_array'] = array(type => 'VARCHAR', size => 30, constraints => '',    Desc => 'arrayname with translation');
+$table['stcstate']['creator']    = array(type => 'ID_TYPE',             constraints => '',    Desc => 'creator ID');
+$table['stcstate']['creation']   = array(type => 'TS_TYPE',             constraints => '',    Desc => 'creation date');
 
 $tableidx['stc2'] = array(
     name  => "stc_idx2",
@@ -51,14 +51,14 @@
     );
 
 
-$table['stc_trans'][name] = 'stc_trans';
-$table['stc_trans'][Desc] = 'TUTOS STC Transition';
-$table['stc_trans']['id']          = array(type => 'ID_TYPE',             constraints => 'PK',  Desc => 'stc trans ID');
-$table['stc_trans']['stc_id']      = array(type => 'ID_TYPE',             constraints => 'NN',  Desc => 'stc ID');
-$table['stc_trans']['stc_state']   = array(type => 'ID_TYPE',             constraints => '',    Desc => 'state ID');
-$table['stc_trans']['next_state']  = array(type => 'ID_TYPE',             constraints => '',    Desc => 'target state ID');
-$table['stc_trans']['creator']     = array(type => 'ID_TYPE',             constraints => '',    Desc => 'creator ID');
-$table['stc_trans']['creation']    = array(type => 'TS_TYPE',             constraints => '',    Desc => 'creation date');
+$table['stctrans'][name] = 'stc_trans';
+$table['stctrans'][Desc] = 'TUTOS STC Transition';
+$table['stctrans']['id']          = array(type => 'ID_TYPE',             constraints => 'PK',  Desc => 'stc trans ID');
+$table['stctrans']['stc_id']      = array(type => 'ID_TYPE',             constraints => 'NN',  Desc => 'stc ID');
+$table['stctrans']['stc_state']   = array(type => 'ID_TYPE',             constraints => '',    Desc => 'state ID');
+$table['stctrans']['next_state']  = array(type => 'ID_TYPE',             constraints => '',    Desc => 'target state ID');
+$table['stctrans']['creator']     = array(type => 'ID_TYPE',             constraints => '',    Desc => 'creator ID');
+$table['stctrans']['creation']    = array(type => 'TS_TYPE',             constraints => '',    Desc => 'creation date');
 
 $tableidx['stc3'] = array(
     name  => "stc_idx3",

Modified: trunk/php/stc/stc.pinc
===================================================================
--- trunk/php/stc/stc.pinc	2021-02-02 15:56:41 UTC (rev 1340)
+++ trunk/php/stc/stc.pinc	2021-03-12 14:02:29 UTC (rev 1341)
@@ -29,8 +29,8 @@
 
         if($dbconn == null) return;
 
-        $this->tablename  = $this->dbconn->prefix.$table['stc_states'][name];
-        $this->tablename3 = $this->dbconn->prefix.$table['stc_trans'][name];
+        $this->tablename  = $this->dbconn->prefix.$table['stcstate'][name];
+        $this->tablename3 = $this->dbconn->prefix.$table['stctrans'][name];
         $this->run_postinit_hook();
     }
 
@@ -74,7 +74,7 @@
      */
     function getColorBlock () {
         return '<span style="font-size:0.8em;background:'.$this->getColor().';">&#160;&#160;</span>&#160;';
-    }
+            }
 
     /**
      * save the stc state data to the database
@@ -88,8 +88,8 @@
         $q->setTable($this->tablename);
         $q->addFV('stc_state',$this->stc_state,'INT');
         $q->addFV('stc_id',$this->stc_id,'INT');
-        $q->addFV('color',$this->color,'STRING',$table['stc_states']['color'][size]);
-        $q->addFV('lang_array',$this->lang_array,'STRING',$table['stc_states']['lang_array'][size]);
+        $q->addFV('color',$this->color,'STRING',$table['stcstate']['color'][size]);
+        $q->addFV('lang_array',$this->lang_array,'STRING',$table['stcstate']['lang_array'][size]);
         $this->save_custom_fields($q);
 
         if ( $this->id < 0 ) {
@@ -168,7 +168,7 @@
 
         $obj->states = array();
 
-        $q = 'SELECT * from '.$obj->dbconn->prefix.$table['stc_states'][name].' where stc_id = '. $obj->id .' order by stc_state';
+        $q = 'SELECT * from '.$obj->dbconn->prefix.$table['stcstate'][name].' where stc_id = '. $obj->id .' order by stc_state';
         $r = $obj->dbconn->Exec($q);
         $n = $r->numrows();
         $a = 0;
@@ -198,7 +198,7 @@
         $this->stc        = null;
         $this->stc_state  = null;
         $this->next_state = null;
-        $this->tablename  = $this->dbconn->prefix .$table['stc_trans'][name];
+        $this->tablename  = $this->dbconn->prefix .$table['stctrans'][name];
         $this->run_postinit_hook();
     }
 
@@ -467,7 +467,7 @@
 
         $obj->trans = array();
 
-        $q = 'SELECT * from '. $obj->dbconn->prefix.$table['stc_trans'][name].' where stc_id = '. $obj->id .' order by stc_state';
+        $q = 'SELECT * from '. $obj->dbconn->prefix.$table['stctrans'][name].' where stc_id = '. $obj->id .' order by stc_state';
         $r = $obj->dbconn->Exec($q);
         $n = $r->numrows();
         $a = 0;
@@ -518,8 +518,8 @@
         $this->stateowner = null; // the class that uses this stc
         if($dbconn == null) return;
         $this->tablename  = $this->dbconn->prefix .$table['stc'][name];
-        $this->tablename2 = $this->dbconn->prefix .$table['stc_states'][name];
-        $this->tablename3 = $this->dbconn->prefix .$table['stc_trans'][name];
+        $this->tablename2 = $this->dbconn->prefix .$table['stcstate'][name];
+        $this->tablename3 = $this->dbconn->prefix .$table['stctrans'][name];
         $this->run_postinit_hook();
     }
 
@@ -833,7 +833,7 @@
         global $table;
 
         $tablename  = $obj->dbconn->prefix .$table['stc'][name];
-        $tablename2 = $obj->dbconn->prefix .$table['stc_states'][name];
+        $tablename2 = $obj->dbconn->prefix .$table['stcstate'][name];
         $q = 'SELECT distinct a.* FROM '. $tablename .' a,'.$tablename2 .' b WHERE b.lang_array = \''. $la .'\' AND a.id = b.stc_id';
         $r = $obj->dbconn->Exec($q);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.