← Back to branch summary

~piersharding/udi/master-udi

« back to all changes in this revision

Viewing changes to lib/AJAXTree.php

  • Committer: Piers Harding
  • Date: 2011-10-02 21:27:04 UTC
  • mfrom: (151.1.63)
  • Revision ID: git-v1:a3e8fccd857706bbe9f37a05061ddc2e2d0b8143
Merge branch 'master' into test-master-merge

Conflicts:
        lib/ds_ldap_pla.php
        lib/page.php

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/AJAXTree.php
57
57
                        return '';
58
58
 
59
59
                # Get our children.
60
 
                $child_count = $this->readChildrenNumber($item);
 
60
                $child_count = $this->readChildrenNumber($entry->getDN());
61
61
 
62
62
                $nb = 0;
63
63
                if ($first_child)
81
81
                $new_code = array('1','1','0','0');
82
82
 
83
83
                # Links
84
 
                $parms['openclose'] = htmlspecialchars(sprintf('server_id=%s&dn=%s&code=%s%s',$this->getServerID(),rawurlencode($item),$code,$new_code[$nb]));
85
 
                $parms['edit'] = htmlspecialchars(sprintf('cmd=template_engine&server_id=%s&dn=%s',$this->getServerID(),rawurlencode($item)));
 
84
                $parms['openclose'] = htmlspecialchars(sprintf('server_id=%s&dn=%s&code=%s%s',$this->getServerID(),$entry->getDNEncode(),$code,$new_code[$nb]));
 
85
                $parms['edit'] = htmlspecialchars(sprintf('cmd=template_engine&server_id=%s&dn=%s',$this->getServerID(),$entry->getDNEncode()));
86
86
                $href = sprintf('cmd.php?%s',$parms['edit']);
87
87
 
88
88
                # Each node has a unique id based on dn
89
 
                $node_id = sprintf('node%s',base64_encode(sprintf('%s-%s',$server->getIndex(),$item)));
 
89
                $node_id = sprintf('node%s',base64_encode(sprintf('%s-%s',$server->getIndex(),$entry->getDN())));
90
90
                $node_id = str_replace('=','_',$node_id);
91
91
 
92
92
                if ($level == 0)
97
97
                echo $this->get_indentation($code);
98
98
 
99
99
                if (! $child_count)
100
 
                        printf('<img align="top" border="0" class="imgs" id="jt%snode" src="%s/%s" alt="--" />',$node_id,IMGDIR,$imgs['tree'][$nb]);
 
100
                        printf('<img id="jt%snode" src="%s/%s" alt="--" class="imgs" style="border: 0px; vertical-align:text-top;" />',$node_id,IMGDIR,$imgs['tree'][$nb]);
101
101
 
102
102
                else {
103
103
                        printf('<a href="#" onclick="return opencloseTreeNode(\'%s\',\'%s\',\'%s\');">',$node_id,$parms['openclose'],IMGDIR);
104
104
 
105
105
                        if ($entry->isOpened())
106
 
                                printf('<img align="top" border="0" class="imgs" id="jt%snode" src="%s/%s" alt="+-" />',$node_id,IMGDIR,$imgs['collapse'][$nb]);
 
106
                                printf('<img id="jt%snode" src="%s/%s" alt="+-" class="imgs" style="border: 0px; vertical-align:text-top;" />',$node_id,IMGDIR,$imgs['collapse'][$nb]);
107
107
                        else
108
 
                                printf('<img align="top" border="0" class="imgs" id="jt%snode" src="%s/%s" alt="+-" />',$node_id,IMGDIR,$imgs['expand'][$nb]);
 
108
                                printf('<img id="jt%snode" src="%s/%s" alt="+-" class="imgs" style="border: 0px; vertical-align:text-top;" />',$node_id,IMGDIR,$imgs['expand'][$nb]);
109
109
 
110
110
                        echo '</a>';
111
111
                }
112
112
 
113
 
                printf('<a href="%s" onclick="return ajDISPLAY(\'BODY\',\'%s\',\'%s\');" title="%s" >',$href,$parms['edit'],_('Retrieving DN'),htmlspecialchars($item));
114
 
                printf('<span class="dnicon"><img align="top" border="0" class="imgs" id="jt%sfolder" src="%s/%s" alt="->" /></span>',$node_id,IMGDIR,$entry->getIcon($server));
 
113
                printf('<a href="%s" onclick="return ajDISPLAY(\'BODY\',\'%s\',\'%s\');" title="%s" >',$href,$parms['edit'],_('Retrieving DN'),htmlspecialchars($entry->getDN()));
 
114
                printf('<span class="dnicon"><img id="jt%sfolder" src="%s/%s" alt="->" class="imgs" style="border: 0px; vertical-align:text-top;" /></span>',$node_id,IMGDIR,$entry->getIcon($server));
115
115
                echo '</a>';
116
116
 
117
117
                echo '&nbsp;';
118
 
                printf('<a href="%s" onclick="return ajDISPLAY(\'BODY\',\'%s\',\'%s\');" title="%s" class="phplm">',$href,$parms['edit'],_('Retrieving DN'),htmlspecialchars($item));
 
118
                printf('<a href="%s" onclick="return ajDISPLAY(\'BODY\',\'%s\',\'%s\');" title="%s" class="phplm">',$href,$parms['edit'],_('Retrieving DN'),htmlspecialchars($entry->getDN()));
119
119
                echo $this->get_formatted_dn($entry,$level-1);
120
120
                echo ($child_count ? (sprintf(' (%s%s)',$child_count,($entry->isSizeLimited() ? '+' : ''))) : '');
121
121
                echo '</a>';
192
192
                for ($i=0; $i<strlen($code); $i++) {
193
193
                        switch ($code[$i]) {
194
194
                                case '0':
195
 
                                        $indent .= sprintf('<img align="top" border="0" class="imgs" src="%s/tree_space.png" alt="  " />',IMGDIR);
 
195
                                        $indent .= sprintf('<img src="%s/tree_space.png" alt="  " class="imgs" style="border: 0px; vertical-align:text-top;" />',IMGDIR);
196
196
                                        break;
197
197
 
198
198
                                case '1':
199
 
                                        $indent .= sprintf('<img align="top" border="0" class="imgs" src="%s/tree_vertline.png" alt="| " />',IMGDIR);
 
199
                                        $indent .= sprintf('<img src="%s/tree_vertline.png" alt="| " class="imgs" style="border: 0px; vertical-align:text-top;" />',IMGDIR);
200
200
                                        break;
201
201
                        }
202
202
                }
211
211
                if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
212
212
                        debug_log('Entered (%%)',33,0,__FILE__,__LINE__,__METHOD__,$fargs);
213
213
 
214
 
                printf('<script type="text/javascript" language="javascript" src="%slayersmenu-browser_detection.js"></script>',JSDIR);
215
 
                printf('<script type="text/javascript" language="javascript" src="%sajax_tree.js"></script>',JSDIR);
 
214
                parent::draw_javascript();
 
215
                printf('<script type="text/javascript" src="%slayersmenu-browser_detection.js"></script>',JSDIR);
 
216
                printf('<script type="text/javascript" src="%sajax_tree.js"></script>',JSDIR);
216
217
        }
217
218
 
218
219
        /**
263
264
 
264
265
                $output = '';
265
266
 
266
 
                $href = sprintf('cmd=template_engine&server_id=%s&container=%s',$this->getServerID(),rawurlencode($entry->getDN()));
 
267
                $href = sprintf('cmd=template_engine&server_id=%s&container=%s',$this->getServerID(),$entry->getDNEncode());
267
268
 
268
269
                $output .= $this->get_indentation($level);
269
 
                $output .= sprintf('<img align="top" border="0" class="imgs" src="%s" alt="--" />',$img);
 
270
                $output .= sprintf('<img src="%s" alt="--" class="imgs" style="border: 0px; vertical-align:text-top;" />',$img);
270
271
                $output .= sprintf('<a href="%s" title="%s">',htmlspecialchars($href),$entry->getDN());
271
 
                $output .= sprintf('<img align="top" border="0" class="imgs" src="%s/create.png" alt="->" />',IMGDIR);
 
272
                $output .= sprintf('<img src="%s/create.png" alt="->" class="imgs" style="border: 0px; vertical-align:text-top;" />',IMGDIR);
272
273
                $output .= '</a>';
273
274
                $output .= '&nbsp;';
274
275