------------------------------------------------------------
revno: 1161
committer: root <[email protected]>
branch nick: public
timestamp: Sun 2012-04-15 04:19:19 -0400
message:
Fixed upload_path and plupload_path to be able to take both relative and
absolute paths, which should help overall problems if someone sets either
in the mover app, or in the admin panel
modified:
libs/Forms.php
libs/Records.php
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'libs/Forms.php'
--- libs/Forms.php 2012-03-21 03:43:54 +0000
+++ libs/Forms.php 2012-04-15 08:19:19 +0000
@@ -512,7 +512,7 @@
case "autofield":
switch ($intwalker[2]){
case "publishdate":
- $form .= ("<label for=\"$intwalker[0]\">" .
+ $form .= ("<label for=\"" . $intwalker[0] . "\">" .
t($intwalker[1]) .
"</label><input type=\"text\"" .
" dir=\"$get_permission_and_man_info[3]\" name=\"$intwalker[0]\" value=\"");
=== modified file 'libs/Records.php'
--- libs/Records.php 2012-04-10 09:05:01 +0000
+++ libs/Records.php 2012-04-15 08:19:19 +0000
@@ -499,7 +499,11 @@
$this->file_name = $name;
- $path = $config['top_folder'] . "/" . $full_path . "";
+ $path = '';
+ if ( is_dir($full_path) )
+ $path = $full_path;
+ else
+ $path = $config['top_folder'] . "/" . $full_path . "";
$tmp_filename = $filename['tmp_name'];
@@ -547,6 +551,8 @@
if ($exists_filename) {
return "__file_is_already_uploaded__ $exists_filename";
}
+
+ $newfile = '';
//check if filename already exists
if ( !file_exists($path.$name) and
!$this->record_exists($name, $tablename,$intwalker[0]) ) {
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
