stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-20 11:29:24 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
Files
2bc73e2e36fefc3c1ee1b8e97e686c6729e58dcb
gallery3/modules/server_add/views/server_add_tree.html.php

42 lines
1.2 KiB
PHP
Raw Normal View History

File structure style fixes
2009-02-24 05:54:19 +00:00
<?php defined("SYSPATH") or die("No direct script access.") ?>
Further simplify server_add (and bump it to version 3). Now we don't have checkboxes, but instead we restrict you to selecting directories and albums from only one level in the hierarchy. This makes it easier for us to make sure that we properly create the hierarchy that you want and avoid confusion about what's going to wind up where. Modify Server_Add_File_Model to have a parent_id and item_id and then modify them as we go so that we can build up a tree structure there *before* we create any items. This makes it much easier to figure out where a new item is going to go and get rid of a bunch of probably buggy code in the main task.
2009-07-11 05:03:36 -07:00
<li class="ui-icon-left">
<span class="ui-icon ui-icon-folder-open"></span>
<span ondblclick="open_dir('')">
<?= t("All") ?>
</span>
<ul>
<? foreach ($parents as $dir): ?>
<li class="ui-icon-left">
<span class="ui-icon ui-icon-folder-open"></span>
Fix double -> single quotes (::js_string returns a double-quotes delimited string)
2009-08-30 23:11:13 -07:00
<span ondblclick='open_dir(<?= html::js_string($dir) ?>)'>
Update all code to use helper method html::clean(), html::purify(), ... instead of SafeString directly.
2009-08-29 22:54:20 -07:00
<?= html::clean(basename($dir)) ?>
Further simplify server_add (and bump it to version 3). Now we don't have checkboxes, but instead we restrict you to selecting directories and albums from only one level in the hierarchy. This makes it easier for us to make sure that we properly create the hierarchy that you want and avoid confusion about what's going to wind up where. Modify Server_Add_File_Model to have a parent_id and item_id and then modify them as we go so that we can build up a tree structure there *before* we create any items. This makes it much easier to figure out where a new item is going to go and get rid of a bunch of probably buggy code in the main task.
2009-07-11 05:03:36 -07:00
</span>
<ul>
<? endforeach ?>
<? foreach ($files as $file): ?>
<li class="ui-icon-left">
<span class="ui-icon <?= is_dir($file) ? "ui-icon-folder-collapsed" : "ui-icon-document" ?>"></span>
<span onclick="select_file(this)"
<? if (is_dir($file)): ?>
ondblclick="open_dir($(this).attr('file'))"
<? endif ?>
(mostly harmless) XSS fix in server add
2009-08-30 21:34:55 -07:00
file="<?= html::clean_attribute($file) ?>"
Further simplify server_add (and bump it to version 3). Now we don't have checkboxes, but instead we restrict you to selecting directories and albums from only one level in the hierarchy. This makes it easier for us to make sure that we properly create the hierarchy that you want and avoid confusion about what's going to wind up where. Modify Server_Add_File_Model to have a parent_id and item_id and then modify them as we go so that we can build up a tree structure there *before* we create any items. This makes it much easier to figure out where a new item is going to go and get rid of a bunch of probably buggy code in the main task.
2009-07-11 05:03:36 -07:00
>
Update all code to use helper method html::clean(), html::purify(), ... instead of SafeString directly.
2009-08-29 22:54:20 -07:00
<?= html::clean(basename($file)) ?>
Further simplify server_add (and bump it to version 3). Now we don't have checkboxes, but instead we restrict you to selecting directories and albums from only one level in the hierarchy. This makes it easier for us to make sure that we properly create the hierarchy that you want and avoid confusion about what's going to wind up where. Modify Server_Add_File_Model to have a parent_id and item_id and then modify them as we go so that we can build up a tree structure there *before* we create any items. This makes it much easier to figure out where a new item is going to go and get rid of a bunch of probably buggy code in the main task.
2009-07-11 05:03:36 -07:00
</span>
</li>
<? endforeach ?>
<? if (!$files): ?>
<li> <i> <?= t("empty") ?> </i> </li>
<? endif ?>
<? foreach ($parents as $dir): ?>
</ul>
</li>
<? endforeach ?>
</ul>
Partial pass of server_add cleanup. It's broken at this stage since I've redone the browsing code but I have not implemented the adding code. 1) Rename index() to browse() since index is too generic. 2) Simplify the data that we pass to _dialog and _tree 3) Change _tree to return list items only, so that the outer dialog can be a <ul> for consistency. 4) Simplify the data structures so that we're not tracking checked vs. unchecked status in the PHP code, it's all done in jquery where we can do it with just a line or two of JS 5) use glob() which pretty much entirely replaces _get_children
2009-07-02 11:23:40 -07:00
</li>
Reference in New Issue Copy Permalink