--- loncom/publisher/lonpubdir.pm 2014/06/20 18:00:51 1.155
+++ loncom/publisher/lonpubdir.pm 2016/06/19 04:27:58 1.169
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Authoring Space Directory Lister
#
-# $Id: lonpubdir.pm,v 1.155 2014/06/20 18:00:51 raeburn Exp $
+# $Id: lonpubdir.pm,v 1.169 2016/06/19 04:27:58 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -67,7 +67,9 @@ sub handler {
$r->send_http_header;
&Apache::lonhtmlcommon::clear_breadcrumbs();
- $r->print(&Apache::loncommon::start_page('Authoring Space').
+ my $js = '<script type="text/javascript"
+ src="/res/adm/includes/file_upload.js"></script>';
+ $r->print(&Apache::loncommon::start_page('Authoring Space', $js).
'<div class="LC_error">'.
'<br /><p>'.
&mt('Your Authoring Space is currently in the location used by LON-CAPA version 2.10 and older, but your domain is using a newer LON-CAPA version ([_1]).',$version).'</p>'.
@@ -80,21 +82,70 @@ sub handler {
}
}
$thisdisfn=~s/^\Q$docroot\E\/priv//;
-
+
my $resdir=$docroot.'/res'.$thisdisfn; # Resource directory
my $targetdir='/res'.$thisdisfn; # Publication target directory.
my $linkdir='/priv'.$thisdisfn; # Full URL name of constr space.
+ my $cstr = 'author';
+ my ($crsauthor,$crstype);
+ if ($env{'request.course.id'}) {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ if ($thisdisfn =~ m{^/\Q$cdom/$cnum\E}) {
+ $crsauthor = 1;
+ $cstr = 'course';
+ $crstype = &Apache::loncommon::course_type();
+ }
+ }
+
my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
- &startpage($r, $uname, $udom, $thisdisfn); # Put out the start of page.
- &dircontrols($r,$uname,$udom,$thisdisfn); # Put out actions for directory,
- # browse/upload + new file page.
+ my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+ my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,
+ "$londocroot/priv/$udom/$uname"); # expressed in kB
+ my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,
+ $cstr,$crstype); # expressed in MB
+
+ # Put out the start of page.
+ &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor);
+
+ if (!-d $fn) {
+ if (-e $fn) {
+ $r->print('<p class="LC_info">'.&mt('Requested item is a file not a directory.').'</p>');
+ } else {
+ $r->print('<p class="LC_info">'.&mt('The requested subdirectory does not exist.').'</p>');
+ }
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+ my @files;
+ if (opendir(DIR,$fn)) {
+ @files = grep(!/^\.+$/,readdir(DIR));
+ closedir(DIR);
+ } else {
+ $r->print('<p class="LC_error">'.&mt('Could not open directory.').'</p>');
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+
+ # Put out actions for directory, browse/upload + new file page.
+ &dircontrols($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota);
&resourceactions($r,$uname,$udom,$thisdisfn); # Put out form used for printing/deletion etc.
my $numdir = 0;
my $numres = 0;
+ if ((@files == 0) && ($thisdisfn =~ m{^/$match_domain/$match_username})) {
+ if ($thisdisfn =~ m{^/$match_domain/$match_username$}) {
+ $r->print('<p class="LC_info">'.&mt('This Authoring Space is currently empty.').'</p>');
+ } else {
+ $r->print('<p class="LC_info">'.&mt('This subdirectory is currently empty.').'</p>');
+ }
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+
# Retrieving value for "sortby" and "sortorder" from QUERY_STRING
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['sortby','sortorder']);
@@ -102,58 +153,88 @@ sub handler {
# Sort by name as default, not reversed
if (! exists($env{'form.sortby'})) { $env{'form.sortby'} = 'filename' }
if (! exists($env{'form.sortorder'})) { $env{'form.sortorder'} = '' }
-
my $sortby = $env{'form.sortby'};
my $sortorder = $env{'form.sortorder'};
- opendir(DIR,$fn);
- my @files = readdir(DIR);
- closedir(DIR);
-
- if ((@files == 0) && ($thisdisfn =~ m{^/$match_domain/$match_username})) {
- $r->print('<p class="LC_info">'.&mt('This Authoring Space is currently empty.').'</p>');
- $r->print(&Apache::loncommon::end_page());
- return OK;
- }
-
- # Start off the directory table.
- $r->print(&Apache::loncommon::start_data_table()
- .&Apache::loncommon::start_data_table_header_row()
- .'<th><a href="'.$linkdir.'/?sortby=filetype&sortorder='
- .((($sortby eq "filetype") && ($sortorder ne 'rev')) ? 'rev' : '')
- .'">'.&mt('Type')
- .'<span class="LC_fontsize_small"> ▼</span></a></th>'
- .'<th>'.&mt('Actions').'</th>'
- .'<th><a href="'.$linkdir.'/?sortby=filename&sortorder='
- .((($sortby eq "filename") && ($sortorder ne 'rev')) ? 'rev' : '')
- .'">'.&mt('Name')
- .'<span class="LC_fontsize_small"> ▼</span></a></th>'
- .'<th><a href="'.$linkdir.'/?sortby=title&sortorder='
- .((($sortby eq "title") && ($sortorder ne 'rev')) ? 'rev' : '')
- .'">'.&mt('Title')
- .'<span class="LC_fontsize_small"> ▼</span></a></th>'
- .'<th colspan="2"><a href="'.$linkdir.'/?sortby=pubstatus&sortorder='
- .((($sortby eq "pubstatus") && ($sortorder ne 'rev')) ? 'rev' : '')
- .'">'.&mt('Status')
- .'<span class="LC_fontsize_small"> ▼</span></a></th>'
- .'<th><a href="'.$linkdir.'/?sortby=cmtime&sortorder='
- .((($sortby eq "cmtime") && ($sortorder ne 'rev')) ? 'rev' : '')
- .'">'.&mt('Last Modified')
- .'<span class="LC_fontsize_small"> ▼</span></a></th>'
- .'<th><a href="'.$linkdir.'/?sortby=size&sortorder='
- .((($sortby eq "size") && ($sortorder ne 'rev')) ? 'rev' : '')
- .'">'.&mt('Size').' (kB)'
- .'<span class="LC_fontsize_small"> ▼</span></a></th>'
+ # Order in which columns are displayed from left to right
+ my @order = ('filetype','actions','filename','title',
+ 'pubstatus','cmtime','size');
+
+ # Up and down arrows to indicate sort order
+ my @arrows = (' ▲',' ▼','');
+
+ # Default sort order and column title
+ my %columns = (
+ filetype => {
+ order => 'ascending',
+ text => &mt('Type'),
+ },
+ actions => {
+ # Not sortable
+ text => &mt('Actions'),
+ },
+ filename => {
+ order => 'ascending',
+ text => &mt('Name'),
+ },
+ title => {
+ order => 'ascending',
+ text => &mt('Title'),
+ },
+ pubstatus => {
+ order => 'ascending',
+ text => &mt('Status'),
+ colspan => '2',
+ },
+ cmtime => {
+ order => 'descending',
+ text => &mt('Last Modified'),
+ },
+ size => {
+ order => 'ascending',
+ text => &mt('Size').' (kB)',
+ },
+ );
+
+ # Print column headers
+ my $output = '';
+ foreach my $key (@order) {
+ my $idx;
+ # Append an up or down arrow to sorted column
+ if ($sortby eq $key) {
+ $idx = ($columns{$key}{order} eq 'ascending') ? 0:1;
+ if ($sortorder eq 'rev') { $idx ++; }
+ $idx = $idx%2;
+ } else { $idx = 2; } # No arrow if column is not sorted
+ $output .= (($columns{$key}{order}) ?
+ '<th'.($columns{$key}{colspan} ? ' colspan="'.$columns{$key}{colspan}.'"' : '')
+ .'><a href="'.$linkdir.'/?sortby='.$key.'&sortorder='
+ .((($sortby eq $key) && ($sortorder ne 'rev')) ? 'rev' : '').'">'
+ .$columns{$key}{text}.$arrows[$idx].'</a></th>' :
+ '<th>'.$columns{$key}{text}.'</th>');
+ }
+
+my $result = "<script type=\"text/javascript\">
+ sessionStorage.setItem('CSTRcache','".&prepareJsonData($uname,$udom,$thisdisfn)."');
+ localStorage.setItem('CSTRtrans', '".&prepareJsonTranslations()."');
+</script>";
+ $r->print($result);
+
+ $r->print('<div id="currentFolder">'.&Apache::loncommon::start_data_table()
+ .'<tr><th colspan="8" id="searchtitle" style="display:none"></th></tr>'
+ .&Apache::loncommon::start_data_table_header_row() . $output
.&Apache::loncommon::end_data_table_header_row()
);
my $dirptr=16384; # Mask indicating a directory in stat.cmode.
my $filehash = {};
foreach my $filename (@files) {
- # Skip .DS_Store and hidden files
+ # Skip .DS_Store, .DAV and hidden files
my ($extension) = ($filename=~/\.(\w+)$/);
- next if (($filename eq '.DS_Store')
- || &Apache::loncommon::fileembstyle($extension) eq 'hdn');
+ next if (($filename eq '.DS_Store')
+ || ($filename eq '.DAV')
+ || (&Apache::loncommon::fileembstyle($extension) eq 'hdn')
+ || ($filename =~ /^\._/));
my ($cmode,$csize,$cmtime)=(stat($fn.'/'.$filename))[2,7,9];
my $linkfilename = &HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"');
@@ -247,10 +328,23 @@ sub handler {
}
}
- $r->print( &Apache::loncommon::end_data_table()
- .&Apache::loncommon::end_page() );
-
- return OK;
+ $r->print(&Apache::loncommon::end_data_table()
+ .'</div><div id="otherplaces" style="display:none">'
+ .&Apache::loncommon::start_data_table()
+ .'<tr><th colspan="7">'.&mt('Results in other directories:').'</th></tr>'
+ .'<tr class="LC_header_row" id="otherplacestable">'
+ .'<th>'.&mt('Type').'</th>'
+ .'<th>'.&mt('Directory').'</th>'
+ .'<th>'.&mt('Name').'</th>'
+ .'<th>'.&mt('Title').'</th>'
+ .'<th colspan="2">'.&mt('Status').'</th>'
+ .'<th>'.&mt('Last Modified').'</th>'
+ .'</tr>'
+ .&Apache::loncommon::end_data_table()
+ .'</div>'
+ .&Apache::loncommon::end_page()
+ );
+ return OK;
}
@@ -259,45 +353,55 @@ sub handler {
# - The HTML header
# - The H1/H3 stuff which includes the directory.
#
-# startpage($r, $uame, $udom, $thisdisfn);
+# startpage($r, $uame, $udom, $thisdisfn, $current_disk_usage, $disk_quota);
# $r - The apache request object.
# $uname - User name.
# $udom - Domain name the user is logged in under.
# $thisdisfn - Displayable version of the filename.
+# $current_disk_usage - User's current disk usage (in kB).
+# $disk_quota - Disk quota for user's authoring space (in MB).
+# $crstype - Course type, if this is for "course author"
sub startpage {
- my ($r, $uname, $udom, $thisdisfn) = @_;
+ my ($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor) = @_;
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
my $formaction='/priv'.$thisdisfn.'/';
$formaction=~s|/+|/|g;
- &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
+
+ my $title;
+ if ($crsauthor) {
+ $title = 'Course Authoring';
+ } else {
+ $title = 'Authoring Space';
+ &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
+ }
&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb({
- 'text' => 'Authoring Space',
+ 'text' => $title,
'href' => &Apache::loncommon::authorspace($formaction),
});
# breadcrumbs (and tools) will be created
# in start_page->bodytag->innerregister
$env{'request.noversionuri'}=$formaction;
- $r->print(&Apache::loncommon::start_page('Authoring Space'));
+ my $js = '<script type="text/javascript"
+ src="/res/adm/includes/file_upload.js"></script>';
+ $r->print(&Apache::loncommon::start_page($title, $js));
- my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
- my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,"$londocroot/priv/$udom/$uname");
- my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,'author'); #expressed in MB
- $disk_quota = 1000 * $disk_quota; # convert from MB to kB
+ $disk_quota = 1024 * $disk_quota; # convert from MB to kB
$r->print(&Apache::loncommon::head_subbox(
'<div style="float:right;padding-top:0;margin-top;0">'
- .&Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota)
+ .&Apache::lonhtmlcommon::display_usage($current_disk_usage,
+ $disk_quota,'authoring')
.'</div>'
.&Apache::loncommon::CSTR_pageheader()));
my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
- my $doctitle = 'LON-CAPA '.&mt('Authoring Space');
+ my $doctitle = 'LON-CAPA '.&mt($title);
my $newname = &mt('New Name');
my $pubdirscript=(<<ENDPUBDIRSCRIPT);
<script type="text/javascript">
@@ -410,7 +514,7 @@ ENDPUBDIRSCRIPT
}
sub dircontrols {
- my ($r,$uname,$udom,$thisdisfn) = @_;
+ my ($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota) = @_;
my %lt=&Apache::lonlocal::texthash(
cnpd => 'Cannot publish directory',
cnrd => 'Cannot retrieve directory',
@@ -441,12 +545,18 @@ sub dircontrols {
go => 'Go',
prnt => 'Print contents of directory',
crea => 'Create a new directory or LON-CAPA document',
+ qs => 'Quick Search',
+ cs => 'Case Sensitive',
+ re => 'Regular Expression',
acti => 'Actions for current directory',
updc => 'Upload a new document',
pick => 'Please select an action to perform using the new filename',
);
my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript
- $r->print(<<END);
+ # Calculate free space in bytes.
+ # $disk_quota is in MB and $current_disk_usage is in kB
+ my $free_space = 1024 * ((1024 * $disk_quota) - $current_disk_usage);
+ $r->printf(<<END,&Apache::loncommon::help_open_topic('Quicksearch'));
<div class="LC_columnSection">
<div>
<form name="curractions" method="post" action="">
@@ -476,7 +586,8 @@ sub dircontrols {
<fieldset>
<legend>$lt{'updc'}</legend>
<input type="hidden" name="filename" value="/priv$thisdisfn/" />
- <input type="file" name="upfile" size="20" />
+ <input type="file" name="upfile" class="flUpload testclass" size="20" />
+ <input type="hidden" id="free_space" value=$free_space />
<input type="button" value="$lt{'uplo'}" onclick="checkUpload(this.form)" />
</fieldset>
</form>
@@ -510,10 +621,59 @@ sub dircontrols {
<option value="newtaskfile">$lt{'nbt'}:</option>
<option value="newlibraryfile">$lt{'nlib'}:</option>
<option value="newdir">$lt{'nsub'}:</option>
- </select> <input type="text" name="newfilename" value="$lt{'type'}" onfocus="if (this.value == '$mytype') this.value=''" /> <input type="button" value="Go" onclick="validate_go();" />
+ </select> <input type="text" name="newfilename" placeholder="$lt{'type'}" value="" onfocus="if (this.value == is.empty()) this.value=''" /> <input type="button" value="Go" onclick="validate_go();" />
+ <br />
+ <span>Quickactions:
+ <input type="hidden" name="mode"/>
+ <a href="javascript:void(0)" onclick="javascript:validate_action('blank')">
+ <img src="/adm/lonIcons/unknown.gif" title="Create blank problem file"></a>
+ <a href="javascript:void(0)" onclick="javascript:validate_action('problemtempl')">
+ <img src="/adm/lonIcons/problem.gif" title="Create new problem from template"></a>
+ <a href="javascript:void(0)" onclick="javascript:validate_action('blankhtml')">
+ <img src="/adm/lonIcons/html.gif" title="Create new blank HTML file"></a>
+ <a href="javascript:void(0)" onclick="javascript:validate_action('folder')">
+ <img src="/adm/lonIcons/navmap.folder.closed.gif" title="Create new subdirectory"></a>
+ </span>
+ <script type="text/javascript">
+ function validate_action(action){
+
+ if (document.getElementsByName(\'newfilename\')[0].value != \'\'){
+ if (action == "blank") {
+ document.fileaction.action.value=\'newproblemfile\';
+ document.fileaction.mode.value=\'blank\';
+ } else if (action == "problemtempl") {
+ document.fileaction.action.value=\'newproblemfile\';
+ validate_go();
+ } else if (action == "blankhtml") {
+ document.fileaction.action.value=\'newhtmlfile\';
+ validate_go();
+ } else if (action == "folder") {
+ document.fileaction.action.value=\'newdir\';
+ document.fileaction.mode.value=\'folder\';
+ }
+ fileaction.submit();
+ } else {
+ alert(\'Please specify file name.\');
+ // TODO: ask for filename? if so, do some refactoring
+
+ }
+ }
+ </script>
</span>
</fieldset>
</form>
+ </div>
+ <div>
+ <fieldset style="display:inline">
+ <legend>$lt{'qs'}</legend>
+ <script type="text/javascript" src="/adm/quicksearch/quicksearch.js"></script>
+ <input type="text" id="quickfilter" placeholder="Enter search term" onkeyup="applyFilter()"/>
+ <input type="button" value="Clear" onclick="document.getElementById(\'quickfilter\').value=\'\'; applyFilter()" />
+ %s
+ <br />
+ <label><input type="checkbox" id="casesens" onchange="applyFilter()"/>$lt{'cs'} </label>
+ <label><input type="checkbox" id="regex" onchange="applyFilter()"/>$lt{'re'} </label>
+ </fieldset>
</div>
</div>
END
@@ -776,6 +936,12 @@ sub putresource {
$editlink=' (<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=editxml">'.&mt('EditXML').'</a>)';
$editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=edit">'.&mt('Edit').'</a>)';
}
+ if ($filename=~/\.(xml|html|htm|xhtml|xhtm)$/ || $filename=~/$LONCAPA::assess_re/) {
+ if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) {
+ my $daxeurl = '/daxepage'.$linkdir.'/'.$filename;
+ $editlink .= ' (<a href="'.$daxeurl.'" target="_blank">Daxe</a>)';
+ }
+ }
if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) {
$editlink.=' (<a href="/adm/cleanup?filename='.$linkfilename.'" target="_parent">'.&mt('Clean Up').')</a>';
}
@@ -857,6 +1023,134 @@ sub check_for_versions {
return $versions;
}
+sub prepareJsonTranslations {
+ my $json =
+ '{"translations":{'.
+ '"edit":"'.&mt('Edit').'",'.
+ '"editxml":"'.&mt('EditXML').'",'.
+ '"editmeta":"'.&mt('Edit Metadata').'",'.
+ '"obsolete":"'.&mt('Obsolete').'",'.
+ '"modified":"'.&mt('Modified').'",'.
+ '"published":"'.&mt('Published').'",'.
+ '"unpublished":"'.&mt('Unpublished').'",'.
+ '"diff":"'.&mt('Diff').'",'.
+ '"retrieve":"'.&mt('Retrieve').'",'.
+ '"directory":"'.&mt('Directory').'",'.
+ '"results":"'.&mt('Show results for keyword:').'"'.
+ '}}';
+}
+
+# gathers all files in the working directory except the ones that are already on screen
+sub prepareJsonData {
+ my ($uname, $udom, $pathToSkip) = @_;
+ my $path = "/home/httpd/html/priv/$udom/$uname/";
+
+ # maximum number of entries, to limit workload and required storage space
+ my $entries = 100;
+ my $firstfile = 1;
+ my $firstdir = 1;
+
+ my $json = '{"resources":[';
+ $json .= &prepareJsonData_rec($path, \$entries, \$firstfile, \$firstdir, $pathToSkip);
+ $json .= ']}';
+
+ # if the json string is invalid the whole search breaks.
+ # so we want to make sure that the string is valid in any case.
+ $json =~ s/,\s*,/,/g;
+ $json =~ s/\}\s*\{/\},\{/g;
+ $json =~ s/\}\s*,\s*\]/\}\]/g;
+ return $json;
+}
+
+# recursive part of json file gathering
+sub prepareJsonData_rec {
+ my ($path, $entries, $firstfile, $firstdir, $pathToSkip) = @_;
+ my $json;
+ my $skipThisFolder = $path =~ m/$pathToSkip\/$/?1:0;
+
+ my @dirs;
+ my @resources;
+ my @ignored = qw(bak log meta save . ..);
+
+# Phase 1: Gathering
+ opendir(DIR,$path);
+ my @files=sort {uc($a) cmp uc($b)} (readdir(DIR));
+ foreach my $filename (@files) {
+ next if ($filename eq '.DS_Store');
+
+ # gather all resources
+ if ($filename !~ /\./) {
+ # its a folder
+ push(@dirs, $filename);
+ } else {
+ # only push files we dont want to ignore
+ next if ($skipThisFolder);
+
+ $filename =~ /\.(\w+?)$/;
+ unless (grep /$1/, @ignored) {
+ push(@resources, $filename);
+ }
+ }
+ }
+ closedir(DIR);
+ # nothing to do here if both lists are empty
+ return unless ( @dirs || @resources );
+
+# Phase 2: Working
+ $$firstfile = 1;
+
+ foreach (@dirs) {
+ $json .= '{"name":"'.$_.'",'.
+ '"path":"'.$path.$_.'",'.
+ '"title":"",'.
+ '"status":"",'.
+ '"cmtime":""},';
+ }
+
+ foreach (@resources) {
+ last if ($$entries < 1);
+ my $title = &getTitleString($path.$_);
+
+ my $privpath = $path.$_;
+ my $respath = $privpath;
+ $respath =~ s/httpd\/html\/priv\//httpd\/html\/res\//;
+
+ my $cmtime = (stat($privpath))[9];
+ my $rmtime = (stat($respath))[9];
+
+ unless ($$firstfile) { $json .= ','; } else { $$firstfile = 0; }
+
+ my $status = 'unpublished';
+
+ # if a resource is published, the published version (/html/res/filepath) gets its own modification time
+ # this is newer or equal then the version in your authoring space (/html/priv/filepath)
+ if ($rmtime >= $cmtime) {
+ # obsolete
+ if (&Apache::lonnet::metadata($respath, 'obsolete')) {
+ $status = 'obsolete';
+ }else{
+ $status = 'published';
+ }
+ } else {
+ $status = 'modified';
+ }
+
+ $json .= '{"name":"'.$_.'",'.
+ '"path":"'.$path.'",'.
+ '"title":"'.$title.'",'.
+ '"status":"'.$status.'",'.
+ '"cmtime":"'.&Apache::lonlocal::locallocaltime($cmtime).'"}';
+ $$entries--;
+ }
+
+ foreach(@dirs) {
+ next if ($$entries < 1);
+ $json .= ',';
+ $json .= &prepareJsonData_rec
+ ($path.$_.'/', $entries, $firstfile, $firstdir, $pathToSkip);
+ }
+ return $json;
+}
1;
__END__