diff options
| -rw-r--r-- | data/templates/default/importNetscape.tpl.php | 4 | ||||
| -rw-r--r-- | kvmxfile | 12 | ||||
| -rw-r--r-- | puppet/config/node/links.example.org.yaml | 14 | ||||
| -rw-r--r-- | www/importNetscape.php | 4 |
4 files changed, 26 insertions, 8 deletions
diff --git a/data/templates/default/importNetscape.tpl.php b/data/templates/default/importNetscape.tpl.php index 627a5af..7ed4bb1 100644 --- a/data/templates/default/importNetscape.tpl.php +++ b/data/templates/default/importNetscape.tpl.php @@ -8,7 +8,7 @@ $this->includeTemplate($GLOBALS['top_include']); <tr valign="top"> <th align="left"><?php echo T_('File'); ?></th> <td> - <input type="hidden" name="MAX_FILE_SIZE" value="1024000" /> + <input type="hidden" name="MAX_FILE_SIZE" value="104857600" /> <input type="file" name="userfile" size="50" /> </td> </tr> @@ -47,4 +47,4 @@ $this->includeTemplate($GLOBALS['top_include']); <?php $this->includeTemplate($GLOBALS['bottom_include']); -?>
\ No newline at end of file +?> @@ -69,12 +69,12 @@ provision_rsync="puppet/ /etc/puppet/" # Absolute path for a provision script located inside the guest. # Needs ssh_support set to "y" and a workable SSH connection to the guest. #provision_command="sudo apt-get update && sudo apt-get dist-upgrade -y && sudo apt-get autoremove -y && sudo apt-get clean" -provision_command="/usr/local/share/kvmx/provision/development && /etc/puppet/bin/provision && /etc/puppet/bin/deploy" -#provision_command="/usr/local/share/kvmx/provision/development && /etc/puppet/bin/deploy" -#provision_command="/usr/local/share/kvmx/provision/development && /home/$user/code/$VM/bin/custom-provisioner" -#provision_command="/usr/local/share/kvmx/provision/development" -#provision_command="/usr/local/share/kvmx/provision/trashman" -#provision_command="/usr/local/share/kvmx/provision/desktop-basic" +provision_command="/usr/local/share/kvmx/provision/debian/development && /etc/puppet/bin/provision && /etc/puppet/bin/deploy" +#provision_command="/usr/local/share/kvmx/provision/debian/development && /etc/puppet/bin/deploy" +#provision_command="/usr/local/share/kvmx/provision/debian/development && /home/$user/code/$VM/bin/custom-provisioner" +#provision_command="/usr/local/share/kvmx/provision/debian/development" +#provision_command="/usr/local/share/kvmx/provision/debian/trashman" +#provision_command="/usr/local/share/kvmx/provision/debian/desktop-basic" # Startup command #startup_command="/path/to/custom/command" diff --git a/puppet/config/node/links.example.org.yaml b/puppet/config/node/links.example.org.yaml index 449feff..9041cbf 100644 --- a/puppet/config/node/links.example.org.yaml +++ b/puppet/config/node/links.example.org.yaml @@ -11,6 +11,20 @@ classes: - 'php' # +# PHP +# +php::config: + #post_max_size: + # series: '7' + # value: '100M' + #upload_max_filesize: + # series: '7' + # value: '100M' + memory_limit: + series: '7' + value: '128M' + +# # MySQL # mysql::server::implementation: 'mariadb-server' diff --git a/www/importNetscape.php b/www/importNetscape.php index 9a52407..909305d 100644 --- a/www/importNetscape.php +++ b/www/importNetscape.php @@ -33,6 +33,10 @@ isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_ $countImportedBookmarks = 0; $tplVars['msg'] = ''; +if ($userservice->isLoggedOn() && sizeof($_FILES)) { +print_r($_FILES['userfile']); +} + if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['size'] > 0) { $userinfo = $userservice->getCurrentObjectUser(); |