|
27 | 27 | foreach ($shortcutstemp as $shortcuttemp) { |
28 | 28 | $shortcuts[basename($shortcuttemp)] = trim(file_get_contents($shortcuttemp)); |
29 | 29 | } |
| 30 | +//print "<pre>"; print_r($shortcuts); print "</pre>"; //??? |
30 | 31 | ?> |
31 | 32 |
|
32 | 33 | <span class="help-block"><?php print $fdata['streamURL_help']; ?></span> |
|
45 | 46 | <select id="audiofolder" name="audiofolder" class="form-control"> |
46 | 47 | <option value="false"><?php print $lang['cardFormFolderSelectDefault']; ?></option> |
47 | 48 | <?php |
48 | | -// read the subfolders of $Audio_Folders_Path |
49 | | -$audiofolders = array_filter(glob($Audio_Folders_Path.'/*'), 'is_dir'); |
50 | | -usort($audiofolders, 'strcasecmp'); |
| 49 | +/* |
| 50 | +* read the subfolders of $Audio_Folders_Path |
| 51 | +*/ |
| 52 | +$audiofolders_abs = dir_list_recursively($Audio_Folders_Path); |
| 53 | +usort($audiofolders_abs, 'strcasecmp'); |
| 54 | +/* |
| 55 | +* get relative paths for pulldown |
| 56 | +*/ |
| 57 | +$audiofolders = array(); |
| 58 | +foreach($audiofolders_abs as $audiofolder){ |
| 59 | + /* |
| 60 | + * get the relative path as value, set the absolute path as key |
| 61 | + */ |
| 62 | + $relpath = substr($audiofolder, strlen($Audio_Folders_Path) + 1, strlen($audiofolder)); |
| 63 | + if($relpath != "") { |
| 64 | + $audiofolders[$audiofolder] = substr($audiofolder, strlen($Audio_Folders_Path) + 1, strlen($audiofolder)); |
| 65 | + } |
| 66 | +} |
| 67 | +//print "<pre>"; print_r($audiofolders); print "</pre>"; //??? |
| 68 | +
|
| 69 | + |
| 70 | +/* |
| 71 | +// counter for ID of each folder |
| 72 | +$idcounter = 0; |
| 73 | +// go through all folders |
| 74 | +foreach($audiofolders as $keyfolder => $audiofolder) { |
| 75 | + if($post['folder'] != $keyfolder) { |
| 76 | + print " <option value='".$keyfolder."'"; |
| 77 | + print ">".$audiofolder."</option>\n"; |
| 78 | + } |
| 79 | +} |
| 80 | +*/ |
| 81 | + |
| 82 | + |
| 83 | +// counter for ID of each folder |
| 84 | +$idcounter = 0; |
51 | 85 |
|
52 | 86 | // check if we can preselect an audiofolder if NOT a foldername was posted |
53 | | -if(! isset($fpost['audiofolder'])) { |
| 87 | +if(! isset($fpost['audiofolder']) OR trim($fpost['audiofolder']) == "") { |
54 | 88 | if(array_key_exists($fpost['cardID'], $shortcuts)) { |
55 | | - print "got one!!!"; |
56 | 89 | $fpost['audiofolder'] = $shortcuts[$fpost['cardID']]; |
57 | 90 | } |
58 | 91 | } |
59 | | - |
60 | | -// counter for ID of each folder |
61 | | -$idcounter = 0; |
62 | 92 |
|
63 | 93 | // go through all folders |
64 | | -foreach($audiofolders as $audiofolder) { |
65 | | - |
66 | | - print " <option value='".basename($audiofolder)."'"; |
67 | | - if(basename($audiofolder) == $fpost['audiofolder']) { |
| 94 | +foreach($audiofolders as $keyfolder => $audiofolder) { |
| 95 | + print " <option value='".$audiofolder."'"; |
| 96 | + if($audiofolder == $fpost['audiofolder']) { |
68 | 97 | print " selected=selected"; |
69 | 98 | } |
70 | | - print ">".basename($audiofolder)."</option>\n"; |
71 | | - |
| 99 | + print ">".$audiofolder."</option>\n"; |
72 | 100 | } |
73 | 101 | ?> |
74 | 102 | </select> |
|
144 | 172 | <div class="form-group"> |
145 | 173 | <label class="col-md-4 control-label" for="YTaudiofolder"></label> |
146 | 174 | <div class="col-md-6"> |
147 | | - <select id="YTaudiofolder" name="YTaudiofolder" class="form-control"> |
| 175 | + <select id="YTaudiofolder" name="audiofolder" class="form-control"> |
148 | 176 | <option value="false"><?php print $lang['cardFormYTSelectDefault']; ?></option> |
149 | 177 | <?php |
150 | | -// read the subfolders of $Audio_Folders_Path |
151 | | -$audiofolders = array_filter(glob($Audio_Folders_Path.'/*'), 'is_dir'); |
152 | | -usort($audiofolders, 'strcasecmp'); |
153 | 178 |
|
154 | 179 | // check if we can preselect an audiofolder if NOT a foldername was posted |
155 | 180 | if(! isset($fpost['audiofolder'])) { |
|
162 | 187 | $idcounter = 0; |
163 | 188 |
|
164 | 189 | // go through all folders |
165 | | -foreach($audiofolders as $audiofolder) { |
166 | | - |
167 | | - print " <option value='".basename($audiofolder)."'"; |
168 | | - if(basename($audiofolder) == $fpost['audiofolder']) { |
| 190 | +foreach($audiofolders as $keyfolder => $audiofolder) { |
| 191 | + print " <option value='".$audiofolder."'"; |
| 192 | + if($audiofolder == $fpost['audiofolder']) { |
169 | 193 | print " selected=selected"; |
170 | 194 | } |
171 | | - print ">".basename($audiofolder)."</option>\n"; |
| 195 | + print ">".$audiofolder."</option>\n"; |
172 | 196 |
|
173 | 197 | } |
174 | 198 | ?> |
|
181 | 205 | <label class="col-md-4 control-label" for="YTstreamFolderName"></label> |
182 | 206 | <div class="col-md-6"> |
183 | 207 | <input value="<?php |
184 | | - if (isset($fpost['streamFolderName'])) { |
185 | | - print $fpost['streamFolderName']; |
| 208 | + if (isset($fpost['YTstreamFolderName'])) { |
| 209 | + print $fpost['YTstreamFolderName']; |
186 | 210 | } |
187 | 211 | ?>" id="YTstreamFolderName" name="YTstreamFolderName" placeholder="<?php print $lang['cardFormYTFolderPlaceholder']; ?>" class="form-control input-md" type="text"> |
188 | 212 | <span class="help-block"><?php print $lang['cardFormYTFolderHelp']; ?></span> |
|
0 commit comments