Code

Removed divlist residues
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 20 Apr 2010 05:30:44 +0000 (05:30 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 20 Apr 2010 05:30:44 +0000 (05:30 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17714 594d385d-05f5-0310-b6e9-bd551577e9d8

gosa-core/include/class_SnapShotDialog.inc
gosa-core/include/class_divlist.inc [deleted file]
gosa-core/include/smarty/plugins/block.render.php

index a8b07cac9dff87f5efb070aab12b4a8c8d9c86cb..471fc187b51fbeb16ee0aa21d0138c748c0bc5bc 100644 (file)
@@ -137,7 +137,7 @@ class SnapShotDialog extends plugin
             /* Sort generated list */
             krsort($list_of_elements);
 
-            /* Add Elements to divlist */      
+            /* Add Elements to list */ 
             $this->last_list = $list_of_elements;
 
             $data = $lData = array();
diff --git a/gosa-core/include/class_divlist.inc b/gosa-core/include/class_divlist.inc
deleted file mode 100644 (file)
index 9a3f699..0000000
+++ /dev/null
@@ -1,381 +0,0 @@
-<?php
-/*
- * This code is part of GOsa (http://www.gosa-project.org)
- * Copyright (C) 2003-2008 GONICUS GmbH
- *
- * ID: $$Id$$
- *
- * This program 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.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-class divlist {
-
-       var $a_entries;
-       var $a_header;
-       var $b_displayPageNums;         
-       var $s_summary;
-       var $cols;
-       var $pageid;
-  //FIXME: Ignoring the fact, that they were missing - height and width are numeric...
-  var $s_height;
-  var $s_width;
-  
-       // Members for page managment
-       var $i_currentPage;
-       var $i_entriesPerPage;
-
-  var $force_height = false;
-  var $list_footer = "";
-  var $fix_list_for_plugins = FALSE;
-  
-       // Added php 4 constructor
-       function divlist($pageid){
-
-               $this->i_currentPage    = 0;
-               $this->i_entriesPerPage = 10;
-    $this->s_height         = "450";
-    $this->s_width          = "600px";
-               $this->s_summary        = "";
-               $this->a_entries        = array();
-               $this->a_header         = array();
-               $this->b_displayPageNums= true;
-               $this->cols             = 0;
-               $this->pageid           = $pageid;
-       }
-
-       function __destruct(){
-       
-       }
-
-  function SetPluginMode($val = TRUE)
-  {
-    $this->fix_list_for_plugins = $val;
-  }
-
-  function SetFooter($str)
-  {
-    $this->list_footer = $str;
-  }
-
-       function AddEntry($a_entriedata) {
-               $this->a_entries[] = $a_entriedata;
-       }
-
-       function DisablePageNums() {
-               $this->b_displayPageNums =false;
-       }
-
-       function SetHeader($a_headerdata) {
-               $this->a_header[] = $a_headerdata ;
-       }
-       
-  function SetHeight($s_height) {
-               $this->s_height= $s_height;
-    $this->force_height = true;
-       }
-  
-  function SetWidth($s_width) {
-               $this->s_width= $s_width;
-    if(preg_match("/^[0-9]*$/",$this->s_width)){
-      $this->s_width .="px";
-    }
-       }
-
-       function SetEntriesPerPage($i_num){
-               $this->i_entriesPerPage=$i_num;
-       }
-       
-       function DrawList(){
-               $s_return = "";
-    if(!$this->force_height){
-                 $s_return.= "<table summary='".$this->s_summary."' style='width:".
-                  $this->s_width.";height:".$this->s_height.
-                  "px;' cellspacing='0' id='t_scrolltable'>";
-    } else {
-                 $s_return.= "<table summary='".$this->s_summary."' style='width:".
-                  $this->s_width.";height:".$this->s_height.
-                  "px;' cellspacing='0' id='t_scrolltable_onlywidth'>";
-    }
-
-    $s_return.= $this->_generateHeader();
-    $s_return.= $this->_generatePage();
-         $s_return.= $this->_generateFooter(); 
-               $s_return.= "</table>";
-               
-               return ($s_return);
-       }
-       
-       function _numpages(){
-               $cnt = count($this->a_entries);
-               
-               $pages  = (int) ($cnt / $this->i_entriesPerPage);
-               if($cnt % $this->i_entriesPerPage){
-      $pages++;
-    }
-               
-               return $pages;
-       }
-       
-       function _numentries(){
-               return count($this->a_entries);
-       }
-
-  function _generateFooter()
-  {
-    $s_return = "";
-    if(!empty($this->list_footer)){
-
-      // Using scrolltable?
-      if($this->i_entriesPerPage == 0) {
-        if(!$this->force_height) {
-          $s_return.= "\n<tr><td class='scrollhead'><table summary='' style='width:100%' cellspacing='0' id='t_scrollfoot'>";
-        } else {
-          $s_return.= "\n<tr><td class='scrollhead'><table summary='' style='width:100%' cellspacing='0'                      id='t_scrollfoot_onlywidth'>";
-        }
-      }
-      $s_return .= "<tr><td class='listfooter' style='border-bottom:0px;'>".$this->list_footer."</td>";
-          // Attach a 13px-wide column (used as scrollbar space in body-table),
-    // but do this only if we are really using scrolltables.
-    if($this->i_entriesPerPage == 0) {
-      $s_return.= "\n<td class='listfooter' style='width:13px;border-right:0px;'>&nbsp;</td>";
-      $s_return.= "\n</table></td>";
-    }
-
-    $s_return.= "\n</tr>";
-
-    }
-    return($s_return);
-  }
-       
-       function _generateHeader(){
-               $s_return = "";
-               $s_value        = "";
-               $s_key          = "";
-               
-    // Using scrolltable?
-    if($this->i_entriesPerPage == 0) {
-      if(!$this->force_height) {
-        $s_return.= "\n<tr><td class='scrollhead'><table summary='' style='width:".$this->s_width.";' cellspacing='0' id='t_scrollhead'>";
-      } else {
-        $s_return.= "\n<tr><td class='scrollhead'><table summary='' style='width:".$this->s_width.";' cellspacing='0' id='t_scrollhead_onlywidth'>";
-      }
-    }
-
-               $s_return.= "\n<tr>";
-
-               foreach($this->a_header[0] as $s_key => $s_value ){
-                       if(!isset($s_value['attach'])){
-                               $s_value['attach'] = "";
-                       }
-
-               $s_return.= "\n<td class='listheader' ".$s_value['attach'].">".$s_value['string']."</td>";
-
-      // Increment column counter
-      $this->cols++;
-
-               }
-               
-    // Attach a 13px-wide column (used as scrollbar space in body-table),
-    // but do this only if we are really using scrolltables.
-    if($this->i_entriesPerPage == 0) {
-      $s_return.= "\n<td class='listheader' style='width:13px;border-right:0px;'>&nbsp;</td>";
-      $s_return.= "\n</table></td>";
-    }
-
-       $s_return.= "\n</tr>";
-               return $s_return;
-       }
-       
-       function SetSummary($msg){
-               $this->s_summary = $msg;
-       }
-
-       function _generatePage(){
-               
-               $s_value        = "";
-               $s_key          = "";
-               $s_return       = "";
-   
-    if($this->i_entriesPerPage == 0) {
-      // We need to construct a "body"-table that is width-of-scrollbar thinner than the "head"-table.
-      if(!$this->force_height || $this->fix_list_for_plugins) {
-        $s_return .= "\n<tr><td colspan='".$this->cols."' class='scrollbody'><div style='width:".$this->s_width.";height:".($this->s_height-20)."px;' id='d_scrollbody' class='scrollbody'>";
-        $s_return .= "<table summary='' style='height:100%;width:581px;' cellspacing='0' id='t_scrollbody'>";
-      } else {
-        $s_return .= "\n<tr><td colspan='".$this->cols."' class='scrollbody'><div style='width:".$this->s_width.";height:".($this->s_height-20)."px;' id='d_scrollbody_onlywidth' class='scrollbody'>";
-        $s_return .= "<table summary='' style='height:100%;width:581px;' cellspacing='0' id='t_scrollbody_onlywidth'>";
-      }
-       }
-    $i_alternate=0;
-               if(isset($_GET['start'])){
-                       session::set('start'.$this->pageid,$_GET['start']);
-                       $start = $_GET['start'];
-               } else {
-                       if(session::is_set('start'.$this->pageid)){
-                               $start = session::get('start'.$this->pageid);
-                       } else {
-                               $start=0;
-                       }
-               }
-
-    /* If divlist is empty, append a single white entry */
-    if(count($this->a_entries)==0){
-      $str = $s_return."<tr>";
-      $str.="<td class='list1nohighlight' colspan='".$this->cols."' style='height:100%;border-right:0px;width:100%;'>&nbsp;</td>";
-      $str.="</tr>";
-      if($this->i_entriesPerPage == 0) {
-        $str.="</table></div></td></tr>";
-      }
-      return($str);
-    } else {
-    
-      //FIXME: Ahrg. I'd like to read this code without wasting my time.
-      if ($this->i_entriesPerPage > 0) {
-               while($start > $this->_numentries()){
-                       $start = $start - $this->i_entriesPerPage;
-               }       
-    
-               $stop  = $start + $this->i_entriesPerPage;
-    
-               $appendempty = ($this->_numentries() -$start);
-    
-               for($i = $start ; $i < $stop;$i++){
-                       
-                       if(isset($this->a_entries[$i])){
-                                                       
-                               $s_value = $this->a_entries[$i];
-                               
-                   // Alternation of background color          
-                               if($i_alternate) $i_alternate=0; else $i_alternate=1;
-                               
-          $s_return .= "\n<tr class='rowxp".$i_alternate."'>";
-                               
-                               $cnt = 0;                                       
-                                       
-                               foreach($s_value as $s_key2 => $s_value2 ){                             
-    
-                                       $cnt++;                                 
-    
-                                       if(!isset($s_value2['class'])){
-                                               $class = "list".$i_alternate; 
-                                       }else{
-                                               $class = $s_value2['class'];
-                                       }
-    
-                                       if(!isset($s_value2['attach'])){
-                                               $style = "";
-                                       }else{
-                                               $style = " ".$s_value2['attach']." "    ;
-                                       }
-    
-                                       $s_return .= "\n<td ".$style." class='".$class."'>";
-                                       $s_return .= $s_value2['string'];
-                                       $s_return .= "\n</td>";
-                               }
-                               if($cnt == 0 ){
-                                       $s_return.="\n<td>&nbsp;</td>";
-                               }
-  
-                               $s_return .= "\n</tr>";
-                       }       
-               }
-    
-               if(!(($stop)<$this->_numentries())){
-                       $nums = $stop - $this->_numentries();// - $stop;
-                       for($i = 0 ; $i < $nums ; $i ++ ){
-                               $s_return.="<tr>";
-                               $cnt=0;
-                               for($a = 0, $l= count($this->a_header[0]); $a < $l ; $a ++ ) {
-                                       if($a ==(count($this->a_header[0])-1)){
-                                               $s_return.="\n<td class='list1' style='border:0px;height:26px;'>&nbsp;</td>";
-                                       } else {
-                                               $s_return.="\n<td class='list1' style='height:26px;'>&nbsp;</td>";
-                                       }
-                               }
-                               $s_return.="\n</tr>";
-                       }       
-               }
-    
-               if($this->b_displayPageNums){
-                       $s_return .= "<tr><td colspan='".$this->cols."' align='center'>".range_selector($this->_numentries(),$start,$this->i_entriesPerPage)."</td></tr>";
-               }
-      } else {
-        // $this->i_entriesPerPage <= 0
-        // We should display all entries on one page
-  
-        $i = $this->_numEntries();
-           foreach($this->a_entries as $s_key => $s_value){
-                         $i--;
-  
-          if($i_alternate!=0){ 
-            $i_alternate=0; 
-          } else {
-            $i_alternate=1;
-          }
-                 
-          $s_return .= "\n<tr class='rowxp".$i_alternate."'>";
-                                 
-                   $cnt = 0;                                   
-                                         
-                         foreach($s_value as $s_key2 => $s_value2 ){                           
-  
-                                 $this->cols = count($s_value) ;                                               
-                                 $cnt++;                                       
-  
-                                 if(!isset($s_value2['class'])){
-                                         $class = "list".$i_alternate; 
-                                 } else {
-                                         $class = $s_value2['class'];
-                                 }
-  
-                                 if(!isset($s_value2['attach'])){
-                                         $style = "";
-                                 } else {
-                                         $style = " ".$s_value2['attach']." "  ;
-                                 }
-            
-            $s_return .= "\n<td ".$style." class='".$class."'>";
-                                 $s_return .= $s_value2['string'];
-                                 $s_return .= "</td>";
-                         }
-                         $s_return .= "\n</tr>";
-                 }
-      }
-  
-      // if fewer than 22 Entries (list not full), print row to fill empty space
-      //FIXME: Why 22? Isn't the size dynamic
-      if($this->_numEntries()<=22){
-        $fill= "";
-        for ($i= 1; $i <= $this->cols; $i++){
-          if ($i == $this->cols){
-           $fill.= "<td class='list1nohighlight' style='height:100%;border-right:0px;'>&nbsp;</td>";
-          } else {
-           $fill.= "<td class='list1nohighlight' style='height:100%;'>&nbsp;</td>";
-          }
-        }
-        $s_return.="\n<tr>$fill";
-      }
-      if($this->i_entriesPerPage == 0) {
-        $s_return .= "\n</table></div></td>";
-      }
-      $s_return .= "</tr>";
-      return $s_return;
-    }
-  }
-}
-
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>
index 83a8fea8e1e04fbcd1e276894a2070503e36f5ab..fbca044b27c1ede72b8d27cf9679be15a2432e5c 100644 (file)
@@ -72,7 +72,7 @@ function smarty_block_render($params, $text, &$smarty)
        /* Disable objects, but keep those active that have mode=read_active */
        if(!(isset($params['mode']) && ($params['mode']=='read_active') && preg_match("/(r|w)/",$acl))){
 
-               /* Disable options && greyout divlists */
+               /* Disable options && greyout lists */
                $from   = array("/class=['\"]list1nohighlight['\"]/i",
                                "/class=['\"]list0['\"]/i",
                                "/class=['\"]list1['\"]/i",