Armagetron Advanced

Revision: 8842
          http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8842&view=rev
Author:   wrtlprnft
Date:     2009-01-17 20:02:39 +0000 (Sat, 17 Jan 2009)

Log Message:
-----------
Disallowed minuses in resource name attributes.

Modified Paths:
--------------
    www/beta/trunk/www-aabeta/add-resource/upload.suid-php

Modified: www/beta/trunk/www-aabeta/add-resource/upload.suid-php
===================================================================
--- www/beta/trunk/www-aabeta/add-resource/upload.suid-php	2009-01-17 19:13:41 UTC (rev 8841)
+++ www/beta/trunk/www-aabeta/add-resource/upload.suid-php	2009-01-17 20:02:39 UTC (rev 8842)
@@ -152,9 +152,9 @@
 	$errs .= 'ERROR: Invalid filepath generated. Path segments cannot begin with a period, nor are backslashes allowed. "category" may not begin with, end with, nor contain two consecutive slashes. Oh, and author/name/version aren\'t allowed to be null!<br /><br />';
 if (!preg_match(",^[a-zA-Z0-9/._-]*$,", $filepath)
  || false !== strpos($attr['author'].$attr['name'].$attr['version'], '/')
- || false !== strpos($attr['author'].$attr['name'].$attr['category'], '.')
+ || false !== strpos($attr['author'].$attr['name'].$attr['category'], '.' || false !== strpos($attr['name'], '-'))
 )
-	$errs .= 'ERROR: Automatic resource uploading is only permitted for resource filepaths containing alphanumerics and the following characters: slash (category only), period (version only), underscore, and dash/hyphen.<br /><br />To submit this resource anyway, email <a href="mailto:luke+aaresource@... /><br />';
+	$errs .= 'ERROR: Automatic resource uploading is only permitted for resource filepaths containing alphanumerics and the following characters: slash (category only), period (version only), underscore, and dash/hyphen (the latter is not allowed in the resource\'s name).<br /><br />To submit this resource anyway, email <a href="mailto:luke+aaresource@... /><br />';
 if ($attr['type'] != 'aamap' && $attr['type'] != 'aacockpit')
 	$errs .= 'ERROR: Only resources of type "aamap" and "aacockpit" are currently accepted via the automatic upload.<br /><br />To submit this resource anyway, email <a href="mailto:luke+aaresource@... /><br />';
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9172
          http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9172&view=rev
Author:   luke-jr
Date:     2009-03-19 19:15:38 +0000 (Thu, 19 Mar 2009)

Log Message:
-----------
add --nonet to xmllint validation

Modified Paths:
--------------
    www/beta/trunk/www-aabeta/add-resource/upload.suid-php

Modified: www/beta/trunk/www-aabeta/add-resource/upload.suid-php
===================================================================
--- www/beta/trunk/www-aabeta/add-resource/upload.suid-php	2009-03-19 19:02:46 UTC (rev 9171)
+++ www/beta/trunk/www-aabeta/add-resource/upload.suid-php	2009-03-19 19:15:38 UTC (rev 9172)
@@ -112,7 +112,7 @@
 fclose($file);
 fclose($processed);
 
-$xmllint = popen("xmllint --valid --dtdattr $processedf 2>&1", 'r');
+$xmllint = popen("xmllint --nonet --valid --dtdattr $processedf 2>&1", 'r');
 $buffer = $bufferhtml = '';
 while (!feof($xmllint)) {
 	$line = fgets($xmllint);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9175
          http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9175&view=rev
Author:   luke-jr
Date:     2009-03-21 16:20:35 +0000 (Sat, 21 Mar 2009)

Log Message:
-----------
restore CLI upload use

Modified Paths:
--------------
    www/beta/trunk/www-aabeta/add-resource/upload.suid-php

Modified: www/beta/trunk/www-aabeta/add-resource/upload.suid-php
===================================================================
--- www/beta/trunk/www-aabeta/add-resource/upload.suid-php	2009-03-20 13:35:41 UTC (rev 9174)
+++ www/beta/trunk/www-aabeta/add-resource/upload.suid-php	2009-03-21 16:20:35 UTC (rev 9175)
@@ -26,13 +26,14 @@
 print_r($_FILES);
 echo "\n-->\n";
 */
-/*
+$sizelimit = 25600;
 if ($_SERVER['argc']) {
 	$filef = $_SERVER['argv'][0];
 	$fileof = $_SERVER['argv'][1];
-	$whoami = '';
-} else*/
-$sizelimit = 25600;
+	$whoami = false;
+	$sizelimit = false;
+}
+else
 if ($_POST['filef']) {
 	$filef = $_POST['filef'];
 	$fileof = $_POST['fileof'];
@@ -167,9 +168,10 @@
 	}
 }
 
+if ($whoami === false)
+	$whoami = $attr['author'];
 if (!in_array($attr['author'], array($whoami, 'Anonymous', 'Nobody')))
 	$errs .= "ERROR: This resource's maintainer (\"author\" attribute) is " . $attr['author'] . ", but you are " . $whoami . ". If you are modifying this resource for yourself, please change the \"author\" attribute to your name. Otherwise, please contact " . $attr['author'] . " and ask him/her/them to upload this resource.<br /><br />";
-
 }
 
 if ($errs)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9176
          http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9176&view=rev
Author:   luke-jr
Date:     2009-03-21 16:25:25 +0000 (Sat, 21 Mar 2009)

Log Message:
-----------
fix bugs in it

Modified Paths:
--------------
    www/beta/trunk/www-aabeta/add-resource/upload.suid-php

Modified: www/beta/trunk/www-aabeta/add-resource/upload.suid-php
===================================================================
--- www/beta/trunk/www-aabeta/add-resource/upload.suid-php	2009-03-21 16:20:35 UTC (rev 9175)
+++ www/beta/trunk/www-aabeta/add-resource/upload.suid-php	2009-03-21 16:25:25 UTC (rev 9176)
@@ -27,9 +27,9 @@
 echo "\n-->\n";
 */
 $sizelimit = 25600;
-if ($_SERVER['argc']) {
-	$filef = $_SERVER['argv'][0];
-	$fileof = $_SERVER['argv'][1];
+if ($_SERVER['argc'] > 1) {
+	$filef = $_SERVER['argv'][1];
+	$fileof = $_SERVER['argv'][2];
 	$whoami = false;
 	$sizelimit = false;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.