openupload-svn-update Mailing List for Open Upload (Page 7)
Status: Beta
Brought to you by:
tsdogs
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(100) |
Nov
(72) |
Dec
(44) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(7) |
Feb
(47) |
Mar
(30) |
Apr
(11) |
May
(10) |
Jun
(8) |
Jul
(1) |
Aug
(22) |
Sep
|
Oct
|
Nov
(13) |
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
(17) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(10) |
Dec
(1) |
| 2011 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ts...@us...> - 2009-02-06 21:01:03
|
Revision: 246
http://openupload.svn.sourceforge.net/openupload/?rev=246&view=rev
Author: tsdogs
Date: 2009-02-06 21:00:59 +0000 (Fri, 06 Feb 2009)
Log Message:
-----------
fix nasty security bug #2573950 for removal too
Modified Paths:
--------------
trunk/lib/modules/default/files.inc.php
Modified: trunk/lib/modules/default/files.inc.php
===================================================================
--- trunk/lib/modules/default/files.inc.php 2009-02-06 20:26:35 UTC (rev 245)
+++ trunk/lib/modules/default/files.inc.php 2009-02-06 21:00:59 UTC (rev 246)
@@ -426,7 +426,7 @@
if ($id != '') {
$finfo = $this->loadFile($id);
$r = isset($_GET['removeid'])?$_GET['removeid']:$_GET['r'];
- if ($finfo[0]['id']!=$id) {
+ if ($finfo[0]['id']!=$id or isset($finfo[0]['group'])) {
app()->error(tr('Wrong file id!'));
redirect();
} else if ($r!=$finfo[0]['remove']) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-06 20:26:39
|
Revision: 245
http://openupload.svn.sourceforge.net/openupload/?rev=245&view=rev
Author: tsdogs
Date: 2009-02-06 20:26:35 +0000 (Fri, 06 Feb 2009)
Log Message:
-----------
fix nasty security bug #2573950
Modified Paths:
--------------
trunk/lib/modules/default/files.inc.php
Modified: trunk/lib/modules/default/files.inc.php
===================================================================
--- trunk/lib/modules/default/files.inc.php 2009-02-06 19:30:07 UTC (rev 244)
+++ trunk/lib/modules/default/files.inc.php 2009-02-06 20:26:35 UTC (rev 245)
@@ -317,7 +317,7 @@
/* check if download exists, and what are the properties */
if ($id != '') {
$finfo = $this->loadFile($id);
- if ($finfo[0]['id']!=$id) {
+ if ($finfo[0]['id']!=$id or isset($finfo[0]['group'])) {
app()->log('warning','downloadRequest','','DENY','File does not exist: ID:'.$id);
app()->error(tr('Requested file does not exist!'));
$this->prevStep();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-06 19:30:15
|
Revision: 244
http://openupload.svn.sourceforge.net/openupload/?rev=244&view=rev
Author: tsdogs
Date: 2009-02-06 19:30:07 +0000 (Fri, 06 Feb 2009)
Log Message:
-----------
update TODO
Modified Paths:
--------------
trunk/TODO
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2009-02-06 19:25:04 UTC (rev 243)
+++ trunk/TODO 2009-02-06 19:30:07 UTC (rev 244)
@@ -1,9 +1,14 @@
TODO list not priority ordered.
******* MUST BE DONE BEFORE RELEASE 0.4 *******
+Administration
+ - A way to add / remove plugins and a way to sort them out
+Users
+ - Add paging to new "My Files" feature
+
Bugs
- - Fix all bugs I find in 0.3 (I hope somebody else will report some if they exsist)
+ - Fix all bugs I find in 0.4beta (I hope somebody else will report some if they exsist)
Database
- txtdb deep testing (switch ?)
@@ -23,12 +28,8 @@
General
- enable modrewrite mode
-- Upload and download of multiple files at the same time
- E-mail customization in configuration
-Users
-- manage personal files (if allowed)
-
Database
- txtdb needs some work. might need file locks.
@@ -37,9 +38,7 @@
Administration
- Review the general administration module
-- Config administration
- Rights switch mode (to switch from 1 mode to the other)
-- Rights better admin tool.
Maintainence
- Create a script to clean up the files/tmpfiles.
@@ -58,7 +57,6 @@
Download wait time (is this really needed?)
User additional fields for registration request.
Antivirus on upload
- Compression of several files into one zip
Translation
- Add a database translator? not until base isn't complete.
@@ -74,5 +72,5 @@
- Change php settings in .htaccess file (low priority)
Others
-- Activity logging
+- Statistics
- Terms of Use for site and registration
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-06 19:25:08
|
Revision: 243
http://openupload.svn.sourceforge.net/openupload/?rev=243&view=rev
Author: tsdogs
Date: 2009-02-06 19:25:04 +0000 (Fri, 06 Feb 2009)
Log Message:
-----------
Add preliminary Personal file listing
Modified Paths:
--------------
trunk/plugins/captcha.inc.php
trunk/plugins/email.inc.php
Added Paths:
-----------
trunk/templates/default/plugins/captcha/fileDetail.tpl
trunk/templates/default/plugins/email/fileDetail.tpl
Modified: trunk/plugins/captcha.inc.php
===================================================================
--- trunk/plugins/captcha.inc.php 2009-02-06 19:23:34 UTC (rev 242)
+++ trunk/plugins/captcha.inc.php 2009-02-06 19:25:04 UTC (rev 243)
@@ -58,6 +58,12 @@
if (!$result) app()->error(tr('Wrong captcha code! please try again.'));
return $result;
}
+
+ function fileDetail(&$finfo,$acl) {
+ if ($finfo[0]['captcha']!='')
+ $this->display('fileDetail');
+ return true;
+ }
}
?>
\ No newline at end of file
Modified: trunk/plugins/email.inc.php
===================================================================
--- trunk/plugins/email.inc.php 2009-02-06 19:23:34 UTC (rev 242)
+++ trunk/plugins/email.inc.php 2009-02-06 19:25:04 UTC (rev 243)
@@ -67,4 +67,34 @@
$finfo[0]['emailto']=='';
return true;
}
+
+ function fileDetail(&$finfo,$acl) {
+ global $_GET;
+ if ($acl!='enable') return true;
+
+ if (isset($_GET['emailme'])) {
+ app()->tpl->assign('remove','yes');
+ $subject = app()->config['site']['title'].': '.tr("Information about your uploaded file: %1",$finfo[0]['description']);
+ app()->tpl->assign('finfo',$finfo);
+ sendMail(app()->config['site']['email'],'noreply',$_SESSION['user']['email'],$subject,'plugins/email/notify');
+ app()->message(tr('E-mail was sent!'));
+ redirect('?action=l&step=2&id='.$_GET['id']);
+ return false;
+ } else if (isset($_GET['sendemail']) and isset($_GET['emailto']) and ($_GET['emailto']!='')) {
+ $subject = $_GET['subject']!=''?$_GET['subject']:tr("An upload was delivered to you");
+ $subject = app()->config['site']['title'].': '.$subject;
+ $finfo[0]['subject']=$_GET['subject'];
+ $finfo[0]['message']=$_GET['message'];
+ app()->tpl->assign('finfo',$finfo);
+ app()->tpl->assign('remove',$_GET['removelink']);
+ sendMail($_SESSION['user']['email'],$_SESSION['user']['email'],$_GET['emailto'],$subject,'plugins/email/notify');
+ app()->message(tr('E-mail was sent to: %1!',$_GET['emailto']));
+ redirect('?action=l&step=2&id='.$_GET['id']);
+ return false;
+ } else {
+ app()->tpl->assign('finfo',$finfo);
+ $this->display('fileDetail');
+ return true;
+ }
+ }
}
\ No newline at end of file
Added: trunk/templates/default/plugins/captcha/fileDetail.tpl
===================================================================
--- trunk/templates/default/plugins/captcha/fileDetail.tpl (rev 0)
+++ trunk/templates/default/plugins/captcha/fileDetail.tpl 2009-02-06 19:25:04 UTC (rev 243)
@@ -0,0 +1 @@
+<tr><td>{tr}Protection{/tr}:</td><td><b>{tr}Captcha{/tr}</b></td></tr>
\ No newline at end of file
Added: trunk/templates/default/plugins/email/fileDetail.tpl
===================================================================
--- trunk/templates/default/plugins/email/fileDetail.tpl (rev 0)
+++ trunk/templates/default/plugins/email/fileDetail.tpl 2009-02-06 19:25:04 UTC (rev 243)
@@ -0,0 +1,15 @@
+{if isset($user.email)}
+<form method="GET" action="{$script}">
+<tr><td>{tr}Send me an e-mail{/tr}:</td><td>
+<input type="hidden" name="action" value="{$action}">
+<input type="hidden" name="step" value="{$step}">
+<input type="hidden" name="id" value="{$finfo[0].id}">
+<input type="submit" name="emailme" value="{tr}Send{/tr}">
+</td></tr>
+{/if}
+<tr><td>{tr}Send e-mail to{/tr}:</td><td><input type="text" size="30" value="{$finfo.emailto}" name="emailto"></td></tr>
+<tr><td>{tr}Send remove link{/tr}:</td><td><input type="checkbox" name="removelink" value="yes"></td></tr>
+<tr><td>{tr}e-mail Subject{/tr}:</td><td><input type="text" size="30" value="{$finfo.subject}" name="subject"></td></tr>
+<tr><td valign="top">{tr}e-mail Message{/tr}:</td><td><textarea cols="30" rows="5" name="message">{$finfo.message}</textarea></td></tr>
+<tr><td> </td><td><input type="submit" name="sendemail" value="{tr}Send{/tr}"></td></tr>
+</form>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-06 19:23:38
|
Revision: 242
http://openupload.svn.sourceforge.net/openupload/?rev=242&view=rev
Author: tsdogs
Date: 2009-02-06 19:23:34 +0000 (Fri, 06 Feb 2009)
Log Message:
-----------
Add preliminary Personal file listing
Display expire date on upload
Added Paths:
-----------
trunk/templates/default/plugins/expire/fileDetail.tpl
trunk/templates/default/plugins/expire/uploadOptions.tpl
Added: trunk/templates/default/plugins/expire/fileDetail.tpl
===================================================================
--- trunk/templates/default/plugins/expire/fileDetail.tpl (rev 0)
+++ trunk/templates/default/plugins/expire/fileDetail.tpl 2009-02-06 19:23:34 UTC (rev 242)
@@ -0,0 +1 @@
+<tr><td>{tr}Expires on{/tr}:</td><td><b>{$expire}</b></td></tr>
\ No newline at end of file
Added: trunk/templates/default/plugins/expire/uploadOptions.tpl
===================================================================
--- trunk/templates/default/plugins/expire/uploadOptions.tpl (rev 0)
+++ trunk/templates/default/plugins/expire/uploadOptions.tpl 2009-02-06 19:23:34 UTC (rev 242)
@@ -0,0 +1 @@
+<tr><td>{tr}Expires on{/tr}:</td><td><b>{$expire}</b></td></tr>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-06 19:22:52
|
Revision: 241
http://openupload.svn.sourceforge.net/openupload/?rev=241&view=rev
Author: tsdogs
Date: 2009-02-06 19:22:47 +0000 (Fri, 06 Feb 2009)
Log Message:
-----------
Add preliminary Personal file listing
Display expire date on upload
Modified Paths:
--------------
trunk/plugins/expire.inc.php
Modified: trunk/plugins/expire.inc.php
===================================================================
--- trunk/plugins/expire.inc.php 2009-02-06 19:21:45 UTC (rev 240)
+++ trunk/plugins/expire.inc.php 2009-02-06 19:22:47 UTC (rev 241)
@@ -24,20 +24,51 @@
return true;
}
- function uploadConfirm(&$finfo,$acl) {
- if ($acl!='enable') return true;
+ function calculateExpireDate() {
+
$group = $this->getGroup('days');
/* now set */
if (!isset($this->config['days'][$group]) and isset($this->config['days']['*'])>0) {
$this->config['days'][$group]=$this->config['days']['*'];
}
if ($this->config['days'][$group]>0) {
- $finfo[0]['expire']=date('Y-m-d',time()+($this->config['days'][$group]*24*60*60));
+ $expire=date('Y-m-d',time()+($this->config['days'][$group]*24*60*60));
} else {
- $finfo[0]['expire']='9999-12-31';
+ $expire='9999-12-31';
}
+ return $expire;
+ }
+
+ function uploadOptions(&$finfo,$acl) {
+ if ($acl!='enable') return true;
+
+ $expire = $this->calculateExpireDate();
+
+ if ($expire!='') {
+ if ($expire == '9999-12-31')
+ app()->tpl->assign('expire',tr('Never'));
+ else
+ app()->tpl->assign('expire',$expire);
+ $this->display('uploadOptions');
+ }
return true;
}
+ function uploadConfirm(&$finfo,$acl) {
+ if ($acl!='enable') return true;
+ $finfo[0]['expire']=$this->calculateExpireDate();
+ return true;
+ }
+
+
+ function fileDetail(&$finfo, $acl) {
+ if ($acl != 'enable') return true;
+
+ if ($finfo[0]['expire']!='') {
+ app()->tpl->assign('expire',$finfo[0]['expire']);
+ $this->display('fileDetail');
+ }
+ return true;
+ }
}
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-06 19:21:48
|
Revision: 240
http://openupload.svn.sourceforge.net/openupload/?rev=240&view=rev
Author: tsdogs
Date: 2009-02-06 19:21:45 +0000 (Fri, 06 Feb 2009)
Log Message:
-----------
Add preliminary Personal file listing
check if email plugin is enabled
Added Paths:
-----------
trunk/templates/default/plugins/password/fileDetail.tpl
Added: trunk/templates/default/plugins/password/fileDetail.tpl
===================================================================
--- trunk/templates/default/plugins/password/fileDetail.tpl (rev 0)
+++ trunk/templates/default/plugins/password/fileDetail.tpl 2009-02-06 19:21:45 UTC (rev 240)
@@ -0,0 +1 @@
+<tr><td>{tr}Protection{/tr}:</td><td><b>{tr}Password{/tr}</b></td></tr>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-06 19:21:30
|
Revision: 239
http://openupload.svn.sourceforge.net/openupload/?rev=239&view=rev
Author: tsdogs
Date: 2009-02-06 19:21:27 +0000 (Fri, 06 Feb 2009)
Log Message:
-----------
Add preliminary Personal file listing
check if email plugin is enabled
Modified Paths:
--------------
trunk/plugins/password.inc.php
Modified: trunk/plugins/password.inc.php
===================================================================
--- trunk/plugins/password.inc.php 2009-02-06 19:20:56 UTC (rev 238)
+++ trunk/plugins/password.inc.php 2009-02-06 19:21:27 UTC (rev 239)
@@ -9,6 +9,13 @@
function uploadOptions(&$finfo,$acl) {
if ($acl!='enable') return true;
+ if (isset(app()->plugins['email']) and
+ isset(app()->pluginAcl['email']) and
+ app()->pluginAcl['email']['access']=='enable') {
+ app()->tpl->assign('emailplugin',true);
+ } else {
+ app()->tpl->assign('emailplugin',false);
+ }
$this->display('uploadOptions');
return true;
}
@@ -49,6 +56,11 @@
return true;
}
}
+ function fileDetail(&$finfo,$acl) {
+ if (($finfo[0]['password']!='') and ($finfo[0]['password']!=crypt("",$finfo[0]['password'])) )
+ $this->display('fileDetail');
+ return true;
+ }
}
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-06 19:21:01
|
Revision: 238
http://openupload.svn.sourceforge.net/openupload/?rev=238&view=rev
Author: tsdogs
Date: 2009-02-06 19:20:56 +0000 (Fri, 06 Feb 2009)
Log Message:
-----------
check if the email plugin is enabled
Modified Paths:
--------------
trunk/templates/default/plugins/password/uploadOptions.tpl
Modified: trunk/templates/default/plugins/password/uploadOptions.tpl
===================================================================
--- trunk/templates/default/plugins/password/uploadOptions.tpl 2009-02-06 19:20:26 UTC (rev 237)
+++ trunk/templates/default/plugins/password/uploadOptions.tpl 2009-02-06 19:20:56 UTC (rev 238)
@@ -1,2 +1,4 @@
<tr><td>{tr}Password protect{/tr}:</td><td><input type="password" size="30" name="protect"></td></tr>
-<tr><td>{tr}Send password in e-mail{/tr}:</td><td><input type="checkbox" value="1" name="protect_notify" checked></td></tr>
\ No newline at end of file
+{if $emailplugin}
+<tr><td>{tr}Send password in e-mail{/tr}:</td><td><input type="checkbox" value="1" name="protect_notify" checked></td></tr>
+{/if}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-06 19:20:30
|
Revision: 237
http://openupload.svn.sourceforge.net/openupload/?rev=237&view=rev
Author: tsdogs
Date: 2009-02-06 19:20:26 +0000 (Fri, 06 Feb 2009)
Log Message:
-----------
Add preliminary Personal file listing
Added Paths:
-----------
trunk/templates/default/modules/files/fileDetail.tpl
trunk/templates/default/modules/files/fileList.tpl
Added: trunk/templates/default/modules/files/fileDetail.tpl
===================================================================
--- trunk/templates/default/modules/files/fileDetail.tpl (rev 0)
+++ trunk/templates/default/modules/files/fileDetail.tpl 2009-02-06 19:20:26 UTC (rev 237)
@@ -0,0 +1,20 @@
+<center>
+<table border="0">
+ <tr><td>{tr}ID{/tr}:</td><td><b>{$finfo.id}</b></td></tr>
+ <tr><td>{tr}File description{/tr}:</td><td><b>{$finfo.description}</b></td></tr>
+ <tr><td>{tr}Date{/tr}:</td><td><b>{$finfo.upload_date}</b></td></tr>
+{foreach from=$files item=f key=k}
+ <tr><td>{tr}File name{/tr}:</td><td><b>{$f.name}</b></td></tr>
+ <tr><td>{tr}File size{/tr}:</td><td><b>{$f.size|fsize_format}</b></td></tr>
+{/foreach}
+{$plugins}
+</table>
+</center>
+<hr />
+<table border="0">
+<tr><td>{tr}Download link{/tr}:</td>
+<td><a href="{$finfo.downloadlink}">{$finfo.downloadlink}</a>
+ </td></tr>
+<tr><td>{tr}Remove link{/tr}:</td><td>
+<a href="{$finfo.removelink}">{$finfo.removelink}</a></td></tr>
+</table>
\ No newline at end of file
Added: trunk/templates/default/modules/files/fileList.tpl
===================================================================
--- trunk/templates/default/modules/files/fileList.tpl (rev 0)
+++ trunk/templates/default/modules/files/fileList.tpl 2009-02-06 19:20:26 UTC (rev 237)
@@ -0,0 +1,18 @@
+<table border="0" id="dbtable">
+<tr>
+ <th width="150">{tr}ID{/tr}</th>
+ <th width="150">{tr}File name{/tr}</th>
+ <th width="200">{tr}Description{/tr}</th>
+ <th width="140">{tr}Date{/tr}</th>
+ <th width="80">{tr}File size{/tr}</th>
+</tr>
+{foreach from=$files item=f}
+<tr>
+ <td><a href="{$script}?action=l&step={$nextstep}&id={$f.id}">{$f.id}</a></td>
+ <td>{$f.name}</td>
+ <td>{$f.description}</td>
+ <td>{$f.upload_date}</td>
+ <td align="right">{$f.size|fsize_format}</td>
+</tr>
+{/foreach}
+</table>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-06 19:19:32
|
Revision: 236
http://openupload.svn.sourceforge.net/openupload/?rev=236&view=rev
Author: tsdogs
Date: 2009-02-06 19:19:27 +0000 (Fri, 06 Feb 2009)
Log Message:
-----------
Add preliminary Personal file listing
Modified Paths:
--------------
trunk/lib/modules/default/files.inc.php
Modified: trunk/lib/modules/default/files.inc.php
===================================================================
--- trunk/lib/modules/default/files.inc.php 2009-02-06 19:18:04 UTC (rev 235)
+++ trunk/lib/modules/default/files.inc.php 2009-02-06 19:19:27 UTC (rev 236)
@@ -22,6 +22,10 @@
2 => "removeConfirm",
3 => "removeResult",
),
+ "l" => array (
+ 1 => "fileList",
+ 2 => "fileDetail",
+ ),
);
var $page;
var $menu;
@@ -37,9 +41,13 @@
"r" => array (
"title" => tr("File Removal"),
),
+ "l" => array (
+ "title" => tr("My Files"),
+ ),
);
$this->menu = array (
"u" => tr("File Upload"),
+ "l" => tr("My Files"),
//"d" => tr("File Download"),
//"r" => tr("File Removal"),
);
@@ -241,16 +249,21 @@
}
}
- function uploadFileInfo() {
- if (isset($_SESSION['user']['u'][0]['id'])) {
- $finfo = $_SESSION['user']['u'];
+ function setupLinks(&$finfo) {
/* get the file info */
$a = 'action'; $i = 'id'; $r = 'removeid';
if (app()->config['use_short_links']=='yes') {
$a = 'a'; $i = 'i'; $r = 'r';
}
$finfo[0]['downloadlink']= app()->config['WWW_SERVER'].app()->config['WWW_ROOT'].'/?'.$a.'=d&'.$i.'='.$finfo[0]['id'];
- $finfo[0]['removelink']= app()->config['WWW_SERVER'].app()->config['WWW_ROOT'].'/?'.$a.'=r&'.$i.'='.$finfo[0]['id'].'&'.$r.'='.$finfo[0]['remove'];
+ $finfo[0]['removelink']=app()->config['WWW_SERVER'].app()->config['WWW_ROOT'].
+ '/?'.$a.'=r&'.$i.'='.$finfo[0]['id'].'&'.$r.'='.$finfo[0]['remove'];
+ }
+
+ function uploadFileInfo() {
+ if (isset($_SESSION['user']['u'][0]['id'])) {
+ $finfo = $_SESSION['user']['u'];
+ $this->setupLinks($finfo);
$result = app()->pluginAction('uploadFileInfo',$finfo,false);
$this->tpl->assign('finfo',$finfo[0]);
$this->tpl->assign('files',$finfo);
@@ -471,6 +484,36 @@
}
}
+ function fileList() {
+ /* TODO: need paging ... */
+ $files = app()->db->read('files',array('user_login'=>app()->user->info('login')),array('upload_date desc'));
+ $result = app()->pluginAction('fileList',$files,false);
+ if (!$result)
+ redirect();
+ $this->tpl->assign('files',$files);
+ }
+
+ function fileDetail() {
+ global $_GET;
+
+ if (!isset($_GET['id'])) {
+ $this->nextStep(1);
+ }
+ $finfo = $this->loadFile($_GET['id']);
+ if (count($finfo)==0) {
+ $this->nextStep(1);
+ } else if ($finfo[0]['user_login']!=app()->user->info('login')) {
+ /* the user has no right to access this file !!! */
+ $this->nextStep(1);
+ }
+ $this->setupLinks($finfo);
+ $result = app()->pluginAction('fileDetail',$finfo,false);
+ if (!$result) {
+ $this->nextStep(1);
+ }
+ $this->tpl->assign('finfo',$finfo[0]);
+ $this->tpl->assign('files',$finfo);
+ }
}
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-06 19:18:09
|
Revision: 235
http://openupload.svn.sourceforge.net/openupload/?rev=235&view=rev
Author: tsdogs
Date: 2009-02-06 19:18:04 +0000 (Fri, 06 Feb 2009)
Log Message:
-----------
Change error reporting set method
Modified Paths:
--------------
trunk/www/index.php
Modified: trunk/www/index.php
===================================================================
--- trunk/www/index.php 2009-02-05 16:25:19 UTC (rev 234)
+++ trunk/www/index.php 2009-02-06 19:18:04 UTC (rev 235)
@@ -33,7 +33,7 @@
define ('__VALID_CALLING_SCRIPT',true);
/* disable notice error reporting */
-ini_set('error_reporting','E_ALL & ~E_NOTICE');
+error_reporting(E_ALL ^ E_NOTICE);
/* check action */
if (isset($_GET['a'])) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-05 16:25:24
|
Revision: 234
http://openupload.svn.sourceforge.net/openupload/?rev=234&view=rev
Author: tsdogs
Date: 2009-02-05 16:25:19 +0000 (Thu, 05 Feb 2009)
Log Message:
-----------
fix missing translation
Modified Paths:
--------------
trunk/templates/default/modules/files/removeResult.tpl
Modified: trunk/templates/default/modules/files/removeResult.tpl
===================================================================
--- trunk/templates/default/modules/files/removeResult.tpl 2009-02-05 15:51:41 UTC (rev 233)
+++ trunk/templates/default/modules/files/removeResult.tpl 2009-02-05 16:25:19 UTC (rev 234)
@@ -5,4 +5,4 @@
{$plugins}
</table>
<br />
-<a href="{$script}">Upload a new file</a>
\ No newline at end of file
+<a href="{$script}">{tr}Upload a new file{/tr}</a>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-05 15:51:45
|
Revision: 233
http://openupload.svn.sourceforge.net/openupload/?rev=233&view=rev
Author: tsdogs
Date: 2009-02-05 15:51:41 +0000 (Thu, 05 Feb 2009)
Log Message:
-----------
Add options for configuring ids length and form
Option for shorter links generation
Modified Paths:
--------------
trunk/www/config.inc.php.example
Modified: trunk/www/config.inc.php.example
===================================================================
--- trunk/www/config.inc.php.example 2009-02-05 15:44:52 UTC (rev 232)
+++ trunk/www/config.inc.php.example 2009-02-05 15:51:41 UTC (rev 233)
@@ -129,6 +129,19 @@
/* Set the number of files to be uploaded in 1 time */
$CONFIG['multiupload'] = '1';
+/* Generate shorter links for download / remove
+ * like ?action=d&id=123892347892 == ?a=d&i=123892347892
+ * Changing this will not affect the handling on one or the other link form
+ *
+ */
+$CONFIG['use_short_links'] = 'no';
+
+/* Defines the length of the generated IDs, suggested at least a value of 6 */
+$CONFIG['id_max_length'] = '10';
+
+/* Create alphanumerical IDs for files */
+$CONFIG['id_use_alpha'] = 'yes';
+
/* Set the progress upload method to be used */
/* requires an extension (APC or UPLOADPROGRESS */
/* possible values are: none, uploadprogress, apc */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-05 15:44:55
|
Revision: 232
http://openupload.svn.sourceforge.net/openupload/?rev=232&view=rev
Author: tsdogs
Date: 2009-02-05 15:44:52 +0000 (Thu, 05 Feb 2009)
Log Message:
-----------
updated changelog
Modified Paths:
--------------
trunk/CHANGELOG
Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG 2009-02-05 15:43:20 UTC (rev 231)
+++ trunk/CHANGELOG 2009-02-05 15:44:52 UTC (rev 232)
@@ -2,6 +2,8 @@
* General
Reviewed the logo / default theme
+ Added option to use shorter links
+ Added options to configure IDs length with alphanumerical string
* Fixed BUGS
- Registration wasn't working 'cause of a api rename bug
@@ -25,7 +27,7 @@
- Added setup script which should simplify first time configuration.
* Logs
- - Createed logs which can be used for statistics.
+ - Created logs which can be used for statistics.
* Upload
- Display upload progress, requires either uploadprogress / apc pecl extensions
@@ -39,8 +41,8 @@
* Translations
- Updated Italian
+ - Added German (Stefan Koshold)
-
Changelog from 0.3b to 0.3c (updated 2008.12.06)
* Fixed Bugs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-05 15:43:24
|
Revision: 231
http://openupload.svn.sourceforge.net/openupload/?rev=231&view=rev
Author: tsdogs
Date: 2009-02-05 15:43:20 +0000 (Thu, 05 Feb 2009)
Log Message:
-----------
Add shorter links handling
Add options for configuring ids length and form
Modified Paths:
--------------
trunk/www/index.php
trunk/www/setup.inc.php
Modified: trunk/www/index.php
===================================================================
--- trunk/www/index.php 2009-02-05 15:42:46 UTC (rev 230)
+++ trunk/www/index.php 2009-02-05 15:43:20 UTC (rev 231)
@@ -32,15 +32,22 @@
define ('__VALID_CALLING_SCRIPT',true);
-/* check authentication */
-if (isset($_GET['action'])) {
+/* disable notice error reporting */
+ini_set('error_reporting','E_ALL & ~E_NOTICE');
+
+/* check action */
+if (isset($_GET['a'])) {
+ $action = $_GET['a'];
+} else if (isset($_GET['action'])) {
$action = $_GET['action'];
} else if (isset($_POST['action'])) {
$action = $_POST['action'];
} else {
$action = '';
}
-if (isset($_GET['step'])) {
+if (isset($_GET['s'])) {
+ $step = $_GET['s'];
+} else if (isset($_GET['step'])) {
$step = $_GET['step'];
} else if (isset($_POST['step'])) {
$step = $_POST['step'];
Modified: trunk/www/setup.inc.php
===================================================================
--- trunk/www/setup.inc.php 2009-02-05 15:42:46 UTC (rev 230)
+++ trunk/www/setup.inc.php 2009-02-05 15:43:20 UTC (rev 231)
@@ -695,6 +695,9 @@
$CONFIG['site']['footer']=str_replace('\"','"',$_POST['sitefooter']);
$CONFIG['registration']['email_confirm']=isset($_POST['confirmregistration'])?$_POST['confirmregistration']:'no';
$CONFIG['max_upload_size']=$_POST['max_upload_size'];
+ $CONFIG['use_short_links']=isset($_POST['use_short_links'])?$_POST['use_short_links']:'no';
+ $CONFIG['id_max_length']=$_POST['id_max_length'];
+ $CONFIG['id_use_alpha']=isset($_POST['id_use_alpha'])?$_POST['id_use_alpha']:'no';
$CONFIG['max_download_time']=$_POST['max_download_time'];
$CONFIG['multiupload']=$_POST['multiupload'];
$CONFIG['progress']=$_POST['progress'];
@@ -726,6 +729,10 @@
$error = true;
msg('Please insert a maximum download time','fail');
}
+ if ($CONFIG['id_max_length']=='') {
+ $error = true;
+ msg('Please insert the IDs length','fail');
+ }
if ($CONFIG['multiupload']<1) {
$error = true;
msg('Please insert a max number of uploaded files per upload','fail');
@@ -749,6 +756,9 @@
$CONFIG['site']['template'] = 'default';
$CONFIG['registration']['email_confirm']='yes';
$CONFIG['max_upload_size']=100;
+ $CONFIG['use_short_links']='yes';
+ $CONFIG['id_max_length']=10;
+ $CONFIG['id_use_alpha']='yes';
$CONFIG['max_download_time']=120;
$CONFIG['multiupload']=1;
$CONFIG['progress']=$_SESSION['progress_values'][count($_SESSION['progress_values'])-1];
@@ -798,6 +808,9 @@
<tr><td>Maximum upload size (in MB):</td><td><input type="text" name="max_upload_size" value="<?php echo $CONFIG['max_upload_size']; ?>"></td></tr>
<tr><td>Maximum download time (in Min)<br />0 disables it:</td><td><input type="text" name="max_download_time" value="<?php echo $CONFIG['max_download_time']; ?>"></td></tr>
<tr><td>Max num. of file uploaded per upload:</td><td><input type="text" name="multiupload" value="<?php echo $CONFIG['multiupload']; ?>"></td></tr>
+<tr><td>Use Short Links?:</td><td><input type="checkbox" name="use_short_links" value="yes" <?php if ($CONFIG['use_short_links']=='yes') echo 'checked'; ?> ></td></tr>
+<tr><td>Length of IDs (suggested min 6):</td><td><input type="text" name="id_max_length" value="<?php echo $CONFIG['id_max_length']; ?>"></td></tr>
+<tr><td>Use alphanumeric IDs?:</td><td><input type="checkbox" name="id_use_alpha" value="yes" <?php if ($CONFIG['id_use_alpha']=='yes') echo 'checked'; ?> ></td></tr>
<tr><td>Upload tracking method:</td><td><select name="progress">
<?php
foreach ($_SESSION['progress_values'] as $v) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-05 15:42:49
|
Revision: 230
http://openupload.svn.sourceforge.net/openupload/?rev=230&view=rev
Author: tsdogs
Date: 2009-02-05 15:42:46 +0000 (Thu, 05 Feb 2009)
Log Message:
-----------
Add options for configuring ids length and form
Modified Paths:
--------------
trunk/templates/default/modules/admin/options.tpl
Modified: trunk/templates/default/modules/admin/options.tpl
===================================================================
--- trunk/templates/default/modules/admin/options.tpl 2009-02-05 15:42:18 UTC (rev 229)
+++ trunk/templates/default/modules/admin/options.tpl 2009-02-05 15:42:46 UTC (rev 230)
@@ -31,7 +31,7 @@
<select name="template">
<option value="">-- {tr}Select one{/tr} --</option>
{foreach from=$templates item=t}
- <option value="{$t}" {if $t==$config.template}selected{/if}>{$t}</option>
+ <option value="{$t}" {if $t==$config.site.template}selected{/if}>{$t}</option>
{/foreach}
</select>
</td></tr>
@@ -39,7 +39,9 @@
<tr><td>{tr}Maximum upload size (in MB){/tr}:</td><td><input type="text" name="max_upload_size" value="{$config.max_upload_size}"></td></tr>
<tr><td>{tr}Maximum download time (in Min){/tr}<br /w>{tr}0 disables it{/tr}:</td><td><input type="text" name="max_download_time" value="{$config.max_download_time}"></td></tr>
<tr><td>{tr}Max num. of file uploaded per upload{/tr}:</td><td><input type="text" name="multiupload" value="{$config.multiupload}"></td></tr>
-<tr><td>{tr}Upload tracking method{/tr}:</td><td><select name="progress">
+<tr><td>{tr}Use shorter links?{/tr}:</td><td><input type="checkbox" name="use_short_links" value="yes" {if $config.use_short_links=='yes'}checked{/if}
+<tr><td>{tr}Length of IDs (suggested min 6){/tr}:</td><td><input type="text" name="id_max_length" value="{$config.id_max_length}"></td></tr>
+<tr><td>{tr}Use alphanumerical IDs?{/tr}:</td><td><input type="checkbox" name="id_use_alpha" value="yes" {if $config.id_use_alpha=='yes'}checked{/if} <tr><td>{tr}Upload tracking method{/tr}:</td><td><select name="progress">
{foreach from=$progress item=t}
<option value="{$t}" {if $t==$config.progress}selected{/if}>{$t}</option>
{/foreach}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-05 15:42:27
|
Revision: 229
http://openupload.svn.sourceforge.net/openupload/?rev=229&view=rev
Author: tsdogs
Date: 2009-02-05 15:42:18 +0000 (Thu, 05 Feb 2009)
Log Message:
-----------
Add shorter links handling
Add options for configuring ids length and form
Modified Paths:
--------------
trunk/lib/modules/default/admin.inc.php
trunk/lib/modules/default/files.inc.php
Modified: trunk/lib/modules/default/admin.inc.php
===================================================================
--- trunk/lib/modules/default/admin.inc.php 2009-02-05 15:40:38 UTC (rev 228)
+++ trunk/lib/modules/default/admin.inc.php 2009-02-05 15:42:18 UTC (rev 229)
@@ -803,6 +803,9 @@
$config['template']=$_POST['template'];
$config['multiupload']=$_POST['multiupload'];
$config['max_upload_size']=$_POST['max_upload_size'];
+ $config['use_short_links']=isset($_POST['use_short_links'])?'yes':'no';
+ $config['id_max_length']=$_POST['id_max_length'];
+ $config['id_use_alpha']=isset($_POST['id_use_alpha'])?'yes':'no';;
$config['progress']=$_POST['progress'];
$config['logging']['enabled']=isset($_POST['logging'])?'yes':'no';
$config['logging']['db_level']=$_POST['log_db_level'];
Modified: trunk/lib/modules/default/files.inc.php
===================================================================
--- trunk/lib/modules/default/files.inc.php 2009-02-05 15:40:38 UTC (rev 228)
+++ trunk/lib/modules/default/files.inc.php 2009-02-05 15:42:18 UTC (rev 229)
@@ -198,9 +198,11 @@
$finfo = $_SESSION['user']['u'][$i];
$finfo['description'] = $_POST['description'];
if ($i==0) {
- $finfo['id']= app()->db->newRandomId('files','id');
+ $s = isset(app()->config['id_max_length'])?app()->config['id_max_length']:30;
+ $a = isset(app()->config['id_use_alpha'])?app()->config['id_use_alpha']=='yes':false;
+ $finfo['id']= app()->db->newRandomId('files','id',$s,$a);
$mainid = $finfo['id'];
- $remove = app()->db->newRandomId('files','remove');
+ $remove = app()->db->newRandomId('files','remove',$s,$a);
$date = date('Y-m-d H:i:s');
} else {
$finfo['id']=$mainid.'_'.$i;
@@ -243,8 +245,12 @@
if (isset($_SESSION['user']['u'][0]['id'])) {
$finfo = $_SESSION['user']['u'];
/* get the file info */
- $finfo[0]['downloadlink']= app()->config['WWW_SERVER'].app()->config['WWW_ROOT'].'/?action=d&id='.$finfo[0]['id'];
- $finfo[0]['removelink']= app()->config['WWW_SERVER'].app()->config['WWW_ROOT'].'/?action=r&id='.$finfo[0]['id'].'&removeid='.$finfo[0]['remove'];
+ $a = 'action'; $i = 'id'; $r = 'removeid';
+ if (app()->config['use_short_links']=='yes') {
+ $a = 'a'; $i = 'i'; $r = 'r';
+ }
+ $finfo[0]['downloadlink']= app()->config['WWW_SERVER'].app()->config['WWW_ROOT'].'/?'.$a.'=d&'.$i.'='.$finfo[0]['id'];
+ $finfo[0]['removelink']= app()->config['WWW_SERVER'].app()->config['WWW_ROOT'].'/?'.$a.'=r&'.$i.'='.$finfo[0]['id'].'&'.$r.'='.$finfo[0]['remove'];
$result = app()->pluginAction('uploadFileInfo',$finfo,false);
$this->tpl->assign('finfo',$finfo[0]);
$this->tpl->assign('files',$finfo);
@@ -276,8 +282,8 @@
global $_GET;
unset($_SESSION['user']['d']);
- if (isset($_GET['id'])) {
- $_SESSION['user']['d'][0]['id'] = $_GET['id'];
+ if (isset($_GET['id']) or isset($_GET['i'])) {
+ $_SESSION['user']['d'][0]['id'] = isset($_GET['id'])?$_GET['id']:$_GET['i'];
$this->nextStep();
}
$finfo = array();
@@ -398,18 +404,19 @@
global $_SESSION;
$id = '';
- if (isset($_GET['id'])) {
- $id = $_GET['id'];
+ if (isset($_GET['id']) or isset($_GET['i'])) {
+ $id = isset($_GET['id'])?$_GET['id']:$_GET['i'];
} else if (isset($_SESSION['user']['r'][0]['id'])) {
$id = $_SESSION['user']['r'][0]['id'];
}
/* check if download exists, and what are the properties */
if ($id != '') {
$finfo = $this->loadFile($id);
+ $r = isset($_GET['removeid'])?$_GET['removeid']:$_GET['r'];
if ($finfo[0]['id']!=$id) {
app()->error(tr('Wrong file id!'));
redirect();
- } else if ($_GET['removeid']!=$finfo[0]['remove']) {
+ } else if ($r!=$finfo[0]['remove']) {
app()->error(tr('Wrong file id!')); /* don't give the user much info on this */
redirect();
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-05 15:40:43
|
Revision: 228
http://openupload.svn.sourceforge.net/openupload/?rev=228&view=rev
Author: tsdogs
Date: 2009-02-05 15:40:38 +0000 (Thu, 05 Feb 2009)
Log Message:
-----------
add alphanumerical random string generation options
Modified Paths:
--------------
trunk/lib/modules/db/mysql.inc.php
trunk/lib/modules/db/pgsql.inc.php
trunk/lib/modules/db/txt.inc.php
Modified: trunk/lib/modules/db/mysql.inc.php
===================================================================
--- trunk/lib/modules/db/mysql.inc.php 2009-02-05 15:40:07 UTC (rev 227)
+++ trunk/lib/modules/db/mysql.inc.php 2009-02-05 15:40:38 UTC (rev 228)
@@ -38,10 +38,10 @@
return $id['newid']+1;
}
- function newRandomId($tbl,$field = 'id') {
+ function newRandomId($tbl,$field = 'id',$size = 30, $alpha = false) {
$found = true;
while ($found) {
- $id = randomName(30,30);
+ $id = randomName($size,$size,$alpha);
$sql = 'SELECT '.$field.' FROM `'.$this->prefix.$tbl.'` WHERE `'.$field.'`="'.$id.'"';
$res = mysql_query($sql);
$found = mysql_num_rows($res)>0;
Modified: trunk/lib/modules/db/pgsql.inc.php
===================================================================
--- trunk/lib/modules/db/pgsql.inc.php 2009-02-05 15:40:07 UTC (rev 227)
+++ trunk/lib/modules/db/pgsql.inc.php 2009-02-05 15:40:38 UTC (rev 228)
@@ -43,10 +43,10 @@
return $id['newid']+1;
}
- function newRandomId($tbl,$field = 'id') {
+ function newRandomId($tbl,$field = 'id',$size = 30, $alpha = false) {
$found = true;
while ($found) {
- $id = randomName(30,30);
+ $id = randomName($size,$size,$alpha);
$sql = 'SELECT '.$field.' FROM "'.$this->prefix.$tbl.'" WHERE "'.$field.'"=\''.$id.'\'';
$res = pg_query($sql);
$found = pg_num_rows($res)>0;
Modified: trunk/lib/modules/db/txt.inc.php
===================================================================
--- trunk/lib/modules/db/txt.inc.php 2009-02-05 15:40:07 UTC (rev 227)
+++ trunk/lib/modules/db/txt.inc.php 2009-02-05 15:40:38 UTC (rev 228)
@@ -146,11 +146,11 @@
return 1;
}
- function newRandomId($tbl,$field = 'id') {
+ function newRandomId($tbl,$field = 'id',$size = 30, $alpha = false) {
$found = true;
$rows = $this->readTxt($this->baseDir.'/'.$tbl.'.txt');
while ($found) {
- $id = randomName(30,30);
+ $id = randomName($size,$size,$alpha);
$found = false;
foreach ($rows as $row) {
/* should check for the exsistence */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-05 15:40:10
|
Revision: 227
http://openupload.svn.sourceforge.net/openupload/?rev=227&view=rev
Author: tsdogs
Date: 2009-02-05 15:40:07 +0000 (Thu, 05 Feb 2009)
Log Message:
-----------
add alphanumerical random string generation option
Modified Paths:
--------------
trunk/lib/general.inc.php
Modified: trunk/lib/general.inc.php
===================================================================
--- trunk/lib/general.inc.php 2009-02-03 18:48:50 UTC (rev 226)
+++ trunk/lib/general.inc.php 2009-02-05 15:40:07 UTC (rev 227)
@@ -51,10 +51,28 @@
exit(0);
}
-function randomName($min = 10, $max = 20) {
+/* generates a random string of length between min and max
+ * if alpha is true it will generate an alphanumeric string
+ */
+function randomName($min = 10, $max = 20, $alpha = false) {
$result = '';
- for ($i = 1; $i<rand($min,$max); $i++) {
- $result.= rand(0,9);
+ $rmax = rand($min,$max);
+ for ($i = 0; $i<$rmax; $i++) {
+ if ($alpha) {
+ $x = rand(0,58);
+ echo $x;
+ if ($x<25) {
+ $x = chr(ord('a') + $x);
+ } else if ($x < 35 ) {
+ $x = $x - 25;
+ } else {
+ $x = chr(ord('A') + ($x - 35));
+ }
+ echo '='.$x.'<br>';
+ $result .= $x;
+ } else {
+ $result.= rand(0,9);
+ }
}
return $result;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-03 18:48:53
|
Revision: 226
http://openupload.svn.sourceforge.net/openupload/?rev=226&view=rev
Author: tsdogs
Date: 2009-02-03 18:48:50 +0000 (Tue, 03 Feb 2009)
Log Message:
-----------
add favicon
Added Paths:
-----------
trunk/www/templates/default/img/openupload.ico
Added: trunk/www/templates/default/img/openupload.ico
===================================================================
(Binary files differ)
Property changes on: trunk/www/templates/default/img/openupload.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-03 18:48:04
|
Revision: 225
http://openupload.svn.sourceforge.net/openupload/?rev=225&view=rev
Author: tsdogs
Date: 2009-02-03 18:47:57 +0000 (Tue, 03 Feb 2009)
Log Message:
-----------
add charset for IE7 to correctly detect it
add favicon
Modified Paths:
--------------
trunk/templates/default/index.tpl
Modified: trunk/templates/default/index.tpl
===================================================================
--- trunk/templates/default/index.tpl 2009-02-03 18:47:12 UTC (rev 224)
+++ trunk/templates/default/index.tpl 2009-02-03 18:47:57 UTC (rev 225)
@@ -1,6 +1,8 @@
<html>
<head>
<title>{$site.title} - {tr}{$page.title}{/tr}</title>
+<meta http-equiv="Content-Type" content="text/html; charset={$charset}">
+<link rel="SHORTCUT ICON" href="{tpl file=img/openupload.ico}">
<link rel="stylesheet" type="text/css" href="{tpl file=/main.css}">
<script language="javascript" type="text/javascript" src="{tpl file=/js/prototype.js}"></script>
</head>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-03 18:47:20
|
Revision: 224
http://openupload.svn.sourceforge.net/openupload/?rev=224&view=rev
Author: tsdogs
Date: 2009-02-03 18:47:12 +0000 (Tue, 03 Feb 2009)
Log Message:
-----------
fix IE7 display problem
Modified Paths:
--------------
trunk/templates/default/modules/auth/loginForm.tpl
Modified: trunk/templates/default/modules/auth/loginForm.tpl
===================================================================
--- trunk/templates/default/modules/auth/loginForm.tpl 2009-02-03 18:46:40 UTC (rev 223)
+++ trunk/templates/default/modules/auth/loginForm.tpl 2009-02-03 18:47:12 UTC (rev 224)
@@ -11,8 +11,8 @@
</table>
</form>
</fieldset>
+</div>
{include file="default/modules/auth/registerlink.tpl"}
-</div>
{literal}
<script langiage="javascript">
obj = document.getElementById('username');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-03 18:46:46
|
Revision: 223
http://openupload.svn.sourceforge.net/openupload/?rev=223&view=rev
Author: tsdogs
Date: 2009-02-03 18:46:40 +0000 (Tue, 03 Feb 2009)
Log Message:
-----------
Fix problems with https and IE7 (Ladislav H?\195?\161jek)
Fix problems with ajax progress and IE7
Modified Paths:
--------------
trunk/lib/modules/default/files.inc.php
Modified: trunk/lib/modules/default/files.inc.php
===================================================================
--- trunk/lib/modules/default/files.inc.php 2009-02-03 18:44:53 UTC (rev 222)
+++ trunk/lib/modules/default/files.inc.php 2009-02-03 18:46:40 UTC (rev 223)
@@ -79,6 +79,8 @@
ob_clean();
header("Cache-Control: no-cache, must-revalidate");
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+ // need this 'cause of IE problems
+ header('Content-Type: text/html; Charset=utf-8');
$progress = array('complete' => 0, 'total' => 0, 'percentage' => 0, 'files' => 0);
switch (app()->config['progress']) {
@@ -372,9 +374,15 @@
app()->log('notice','serveFile','','ALLOW',$finfo[$num]['id']);
/* disable and clean output buffer so it won't reach memory limit */
ob_end_clean();
+ header('Content-Description: File Transfer');
header('Content-Type: '.$finfo[$num]['mime']);
header('Content-Length: '.$filesize);
header('Content-Disposition: attachment; filename="'.$finfo[$num]['name'].'"');
+ header('Content-Transfer-Encoding: binary');
+ header('Expires: 0');
+ header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+ header('Pragma: public');
+
readfile($file);
/* file should have been sent now let's reset the download info */
if (!$_SESSION['user']['d'][0]['protected'])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2009-02-03 18:44:58
|
Revision: 222
http://openupload.svn.sourceforge.net/openupload/?rev=222&view=rev
Author: tsdogs
Date: 2009-02-03 18:44:53 +0000 (Tue, 03 Feb 2009)
Log Message:
-----------
add default utf-8 charset
Modified Paths:
--------------
trunk/lib/modules/tr/gettext.inc.php
trunk/lib/modules/tr/null.inc.php
trunk/lib/modules/tr/phparray.inc.php
Modified: trunk/lib/modules/tr/gettext.inc.php
===================================================================
--- trunk/lib/modules/tr/gettext.inc.php 2009-01-19 11:55:42 UTC (rev 221)
+++ trunk/lib/modules/tr/gettext.inc.php 2009-02-03 18:44:53 UTC (rev 222)
@@ -20,9 +20,12 @@
$r = setlocale(LC_ALL,$lang['locale']);
if ($r != $lang['locale'])
app()->message('WARNING: locale '.$lang['locale'].' not supported by your system.');
- /* setup page encoding */
- if (isset($lang['charset']))
- header('Content-Type: text/html; charset='.$lang['charset']);
+ /* setup page encoding */
+ if (!isset($lang['charset']) or $lang['charset']=='') {
+ $lang['charset']='utf8';
+ }
+ header('Content-Type: text/html; charset='.$lang['charset']);
+ app()->tpl->assign('charset',$lang['charset']);
}
Modified: trunk/lib/modules/tr/null.inc.php
===================================================================
--- trunk/lib/modules/tr/null.inc.php 2009-01-19 11:55:42 UTC (rev 221)
+++ trunk/lib/modules/tr/null.inc.php 2009-02-03 18:44:53 UTC (rev 222)
@@ -7,6 +7,12 @@
function NullTranslator() {
}
+ function init() {
+ /* setup page encoding */
+ header('Content-Type: text/html; charset=utf8');
+ app()->tpl->assign('charset','utf8');
+
+ }
function translate($txt,$domain = 'openupload') {
return $txt;
}
Modified: trunk/lib/modules/tr/phparray.inc.php
===================================================================
--- trunk/lib/modules/tr/phparray.inc.php 2009-01-19 11:55:42 UTC (rev 221)
+++ trunk/lib/modules/tr/phparray.inc.php 2009-02-03 18:44:53 UTC (rev 222)
@@ -32,9 +32,12 @@
$this->TR['template']=$tr;
}
}
- /* setup page encoding */
- if (isset($lang['charset']))
- header('Content-Type: text/html; charset='.$lang['charset']);
+ /* setup page encoding */
+ if (!isset($lang['charset']) or $lang['charset']=='') {
+ $lang['charset']='utf8';
+ }
+ header('Content-Type: text/html; charset='.$lang['charset']);
+ app()->tpl->assign('charset',$lang['charset']);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|