From 9619fbae4070169b5e7750c12ae6fd6d3d7ce466 Mon Sep 17 00:00:00 2001 From: Git Date: Wed, 19 Dec 2012 08:00:21 +0000 Subject: [PATCH] Empty commit --- design/privateheader.php | 2 +- sections/torrents/browse2.php | 2 +- sections/torrents/notify.php | 2 +- sections/upload/upload_handle.php | 12 ++++++++++-- static/styles/anorex/style.css | 5 +++++ static/styles/kuro/style.css | 5 +++++ 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/design/privateheader.php b/design/privateheader.php index 9e9aa9d7..4834122a 100644 --- a/design/privateheader.php +++ b/design/privateheader.php @@ -122,7 +122,7 @@
  • Required:
  • 0) { ?> -
  • Tokens:
  • +
  • Tokens:
  • -
    +

    diff --git a/sections/torrents/notify.php b/sections/torrents/notify.php index a362d3f1..85f4858f 100644 --- a/sections/torrents/notify.php +++ b/sections/torrents/notify.php @@ -134,7 +134,7 @@ function header_link($SortKey, $DefaultWay = "desc") { View::show_header('My notifications', 'notifications'); ?> -
    +

    Latest notifications

    diff --git a/sections/upload/upload_handle.php b/sections/upload/upload_handle.php index f9258084..436afe08 100644 --- a/sections/upload/upload_handle.php +++ b/sections/upload/upload_handle.php @@ -368,6 +368,8 @@ $HasLog = "'0'"; $HasCue = "'0'"; +$TooLongPaths = array(); + foreach($FileList as $File) { list($Size, $Name) = $File; // add +log to encoding @@ -381,16 +383,22 @@ check_file($Type, $Name); - // Make sure the filename is not too long if(mb_strlen($Name, 'UTF-8') + mb_strlen($DirName, 'UTF-8') + 1 > MAX_FILENAME_LENGTH) { - $Err = 'The torrent contained one or more files with too long a name ('.$Name.')'; + $TooLongPaths[] = $Name; } // Add file and size to array $TmpFileList[] = $Name .'{{{'.$Size.'}}}'; // Name {{{Size}}} } +if(count($TooLongPaths)!=0) { + $Names = ''; + foreach($TooLongPaths as $Name) {$Names .= '
    '.$Name;} + /* $Err = 'The torrent contained one or more files with too long a name ('.$Name.')'; */ + $Err = 'The torrent contained one or more files with too long a name:'.$Names; +} + // To be stored in the database $FilePath = isset($Tor->Val['info']->Val['files']) ? db_string(Format::make_utf8($DirName)) : ""; diff --git a/static/styles/anorex/style.css b/static/styles/anorex/style.css index 57b6db1c..0e3e5ccc 100644 --- a/static/styles/anorex/style.css +++ b/static/styles/anorex/style.css @@ -317,6 +317,11 @@ input.hidden { margin-right:auto; } +.widethin { /* overriding the thin class on torrents.php */ + width: 95% !important; + margin: 0px auto; +} + div.linkbox { text-align:center; padding: 5px; diff --git a/static/styles/kuro/style.css b/static/styles/kuro/style.css index adc2d972..2623f91c 100644 --- a/static/styles/kuro/style.css +++ b/static/styles/kuro/style.css @@ -436,6 +436,11 @@ input.hidden { margin: 0px auto; } +.widethin { /* overriding the thin class on torrents.php */ + width: 95% !important; + margin: 0px auto; +} + #userinfo_username .brackets:before { content: "["; }