1
0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00

Download URL fixes

This commit is contained in:
Cameron 2017-04-13 09:43:29 -07:00
parent f8ba98d845
commit b38183035d
4 changed files with 13 additions and 12 deletions

View File

@ -143,8 +143,9 @@ class admin_start
e_PLUGIN."online_extended_menu/languages/English.php",
e_PLUGIN."pm/sendpm.sc",
e_PLUGIN."pm/shortcodes/",
e_PLUGIN."social/e_header.php"
e_PLUGIN."social/e_header.php",
e_PLUGIN."download/url/url.php",
e_PLUGIN."download/url/sef_url.php",
);

View File

@ -110,9 +110,9 @@ class download_url // plugin-folder + '_url'
$config['index'] = array(
'regex' => '{alias}/?$',
'sef' => '{alias}',
'redirect' => '{e_PLUGIN}download/download.php',
'regex' => '{alias}/?(.*)$',
'sef' => '{alias}/',
'redirect' => '{e_PLUGIN}download/download.php$1',
);

View File

@ -535,9 +535,10 @@ class download
}
$sql = e107::getDb();
$sql = e107::getDb('dlrow');
$tp = e107::getParser();
$ns = e107::getRender();
$pref = e107::getPref();
// $sc = new download_shortcodes;
$sc = e107::getScBatch('download',true);
@ -688,10 +689,12 @@ class download
$dlft = ($filetotal < $this->qry['view'] ? $filetotal: $this->qry['view']);
$current_row = 1;
while($dlrow = $sql->fetch())
{
$sc->setVars($dlrow);
$sc->setVars($dlrow);
$agreetext = $tp->toHTML($pref['agree_text'], TRUE, 'DESCRIPTION');
$current_row = ($current_row) ? 0: 1;
// Alternating CSS for each row.(backwards compatible)
@ -700,9 +703,6 @@ class download
$dltdownloads += $dlrow['download_requested'];
$dl_text .= $tp->parseTemplate($template, TRUE, $sc);
}
$dl_text .= $tp->parseTemplate($DOWNLOAD_LIST_TABLE_END, TRUE, $sc);

View File

@ -328,7 +328,7 @@ class download_main_admin_ui extends e_admin_ui
'download_comment' => array('title'=> DOWLAN_102, 'type' => 'boolean', 'data' => 'int', 'width' => '5%', 'thclass' => 'center', 'batch' => TRUE, 'filter'=>TRUE, 'noedit' => true),
'download_class' => array('title'=> DOWLAN_113, 'type' => 'userclass', 'width' => 'auto', 'inline'=>true, 'data' => 'int','batch' => TRUE, 'filter'=>TRUE),
'download_visible' => array('title'=> LAN_VISIBILITY, 'type' => 'userclass', 'width' => 'auto', 'data' => 'int', 'batch' => TRUE, 'filter'=>TRUE),
'download_visible' => array('title'=> LAN_VISIBILITY, 'type' => 'userclass', 'inline'=>true, 'width' => 'auto', 'data' => 'int', 'batch' => TRUE, 'filter'=>TRUE),
'download_mirror' => array('title'=> DOWLAN_128, 'type' => 'text', 'data' => 'str', 'width' => '10%', 'thclass' => 'center' ),
'download_mirror_type' => array('title'=> DOWLAN_195, 'type' => 'method', 'data' => 'str', 'width' => '10%', 'thclass' => 'center' ),