Changeset 40

Timestamp:

Aug 27, 2007, 11:06:37 PM (18 years ago)

Author:

amp4ecs

Message:

Fixed double display of sessions in speaker list.
Fixed sql warnings at pressing back link.

File:

• trunk/pi1/class.tx_wseevents_pi1.php (modified) (13 diffs)

trunk/pi1/class.tx_wseevents_pi1.php ¶

@@ -104 +104 @@
                 }
         }
+
+        
+        
+        
+        
         
         /**
@@ -214 +219 @@
                             $label = $this->getFieldContent('name');  // the link text
                             $overrulePIvars = '';//array('session' => $this->getFieldContent('uid'));
-                            $overrulePIvars = array('showSessionUid' => $this->internal['currentRow']['uid'], 'backUid' => $GLOBALS['TSFE']->id);
+                            $overrulePIvars = array('showSessionUid' => $this->internal['currentRow']['uid'], 'backUid' => $GLOBALS['TSFE']->id, 'back2list' => '1');
                             $clearAnyway=1;    // the current values of piVars will NOT be preserved
                             $altPageId=$this->conf['singleSession'];      // ID of the target page, if not on the same page
@@ -244 +249 @@
                 return $content;
         }
+
+
+        
+        
+        
+        
+        
+        
+        
 
         /**
@@ -382 +396 @@
                                         if (!empty($this->conf['singleSession'])) {
                                                 $overrulePIvars = '';//array('session' => $this->getFieldContent('uid'));
-                                                $overrulePIvars = array('showSessionUid' => $k, 'backUid' => $GLOBALS['TSFE']->id);
+                                                $overrulePIvars = array('showSessionUid' => $k, 'backUid' => $GLOBALS['TSFE']->id, 'back2list' => '1');
                                                 $clearAnyway=1;    // the current values of piVars will NOT be preserved
                                                 $altPageId=$this->conf['singleSession'];      // ID of the target page, if not on the same page
@@ -415 +429 @@
         }
 
+        
+        
+        
+        
+        
+        
+        
+        
         /**
          * Display the details of a single session
@@ -442 +464 @@
                 // Link for back to list view
                 $label = $this->pi_getLL('back','Back');  // the link text
-                $overrulePIvars = array ('showSessionUid' => $this->piVars['showSessionUid']);
+                if ($this->piVars['back2list']<>1) {
+                        # Back to single view
+                        $overrulePIvars = array ('showSessionUid' => $this->piVars['showSessionUid']);
+                }
                 $clearAnyway=1;    // the current values of piVars will NOT be preserved
                 $altPageId=$this->piVars['backUid'];      // ID of the view page
@@ -463 +488 @@
         }
 
+        
+        
+        
+        
+        
+        
+        
+        
         /**
          * Display the details of a single speaker
@@ -566 +599 @@
         }
 
+        
+        
+        
+        
+        
+        
+        
         /**
          * Get content of one field
@@ -733 +773 @@
         }
 
+        
+        
+        
+        
+        
+        
+        
         /**
         * Get the translated content of a field
@@ -739 +786 @@
         function getTranslatedField($dbname, $fN, $fUid=-1) {
                 $index = $GLOBALS['TSFE']->sys_language_uid;
+                if ($fUid<0) {
+                        $fUid = $this->internal['currentRow']['uid'];
+                }
                 if ($index<>0) {
                         // for the name of a session, check if a translation is there
-                        if ($fUid<0) {
-                                $fUid = $this->internal['currentRow']['uid'];
-                        }
                         $where = 'deleted=0 AND hidden=0 AND l18n_parent='.$fUid.' AND sys_language_uid='.$index;
                         $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery($fN, $dbname, $where);
@@ -760 +807 @@
                 } else {
                         //show default language
-                        return $this->internal['currentRow'][$fN];
+//                      return $this->internal['currentRow'][$fN];
+                        $where = 'deleted=0 AND hidden=0 AND uid='.$fUid;
+                        $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery($fN, $dbname, $where);
+                        $row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
+                        $datacount = $row[$fN];
+                        return $datacount;
                 }
         }
+        
+        
+        
+        
+        
+        
+        
         
         /**
@@ -787 +846 @@
         }
         
+        
+        
+        
+        
+        
+        
         /**
          * Get list of session UIDs for the speaker
          */
         function getSpeakerSessionList($speakerid,$eventPid) {
-                $where = '';
+                $where = 'deleted=0 AND hidden=0 AND sys_language_uid=0';
                 $this->conf['pidList'] = $eventPid;
-                $res = $this->pi_exec_query('tx_wseevents_sessions',0,$where);
+#               $res = $this->pi_exec_query('tx_wseevents_sessions',0,$where);
+                $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery('speaker, uid', 'tx_wseevents_sessions', $where);
                 while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                         foreach(explode(',',$row['speaker']) as $k){
@@ -807 +873 @@
                 return $sessions;
         }
+         
+         
+         
+         
+         
          
          /**