fixed all errors on local upload, now testing cloud uploads

.gitignore

 uploads/*
 uploads/*
 vendor
 vendor
+index.php

application/config/config.php

@@ -523,3 +523,15 @@ $config['rewrite_short_tags'] = FALSE;
 | Array:		array('10.0.1.200', '192.168.5.0/24')
 | Array:		array('10.0.1.200', '192.168.5.0/24')
 */
 */
 $config['proxy_ips'] = '';
 $config['proxy_ips'] = '';
+
+/* ------------------------------------------------------------------
+| Configuration of the upload helper for enabling user uploads
+| 
+| amontejo@ujaen.es - 2020
+--------------------------------------------------------------------*/
+
+// Destination storage path (don't forget trailing '/')
+$config['upload_path'] = ENVIRONMENT == 'production' ? 'gs://wbt2020.appspot.com/uploads/' : './uploads/';
+
+// Prefix for building public URL to the uploaded file
+$config['upload_prefix'] = ENVIRONMENT == 'production' ? 'https://storage.cloud.google.com/uploads/' : $config['base_url'] . 'uploads/';
\ No newline at end of file

application/controllers/Upload.php

 <?php
 <?php
-
+/*
+| This is an example controller to show how to use upload helper
+| amontejo@ujaen.es - 2020
+*/
 class Upload extends CI_Controller {
 class Upload extends CI_Controller {
 
 
     function __construct ()  {
     function __construct ()  {
@@ -8,12 +11,8 @@ class Upload extends CI_Controller {
 
 
     public function upload() {      
     public function upload() {      
         $this->load->helper('upload');
         $this->load->helper('upload');
-        //if (ENVIRONMENT == 'production') {
-        //    $url = upload_to_bucket('wbt2020.appspot.com', 'uploads');
-        //} else {
-            $url = upload_to_local('./uploads');
-        //}
-        $this->load->view('upload', array('img_url' => $url));
+        $fileurl = upload_file();
+        $this->load->view('upload', array('img_url' => $fileurl));
     }
     }
 
 
 }
 }
\ No newline at end of file

application/helpers/upload_helper.php

 <?php
 <?php
 /*
 /*
-require 'vendor/autoload.php';
-use Google\Cloud\Storage\StorageClient;
-
-// Store file in $path in the bucket $bucket_name
-function upload_to_bucket ($bucket_name, $path) {
+| This is the upload helper
+| amontejo@ujaen.es - 2020
+*/
 
 
-    if(isset($_FILES['file'])) {
-        
-        // Authentication with Google Cloud Platform
-        $storage = new StorageClient();
-        $bucket = $storage->bucket($bucket_name);
-        
-        // Upload a file to the bucket.
-        $file = pathinfo($_FILES['file']['name']);
-        $prefix = uniqid('uploaded_', true); //generate random string to avoid name conflicts
-        $filename = $path . '/' . $prefix . "." . $file['extension'];
-        $bucket->upload(
-            fopen($_FILES['file']['tmp_name'], 'r'),
-            ['name' => $filename]
-        );  
-        return ('https://storage.cloud.google.com/'.$bucket_name.'/'.$filename);
-        
-    }  
-}
+/*
+    This function will check if there is a input POST 'file' item. 
+    If so, it will save the file to the path specified by the
+    'upload_path' config parameter set at config/config.php 
+    
+    It returns the public URL path to the uploaded file, which is defined
+    in the 'upload_prefix' config parameter.
 */
 */
-// upload a file to local server filesystem
-function upload_to_local ($path) {
+function upload_file () {
+    
     if(isset($_FILES['file'])) {
     if(isset($_FILES['file'])) {
-        $config['upload_path']          = 'gs://wbt2020.appspot.com/uploads/';//$path;
+        $ci =& get_instance();
+        $config['upload_path']          = $ci->config->item('upload_path');
         $config['allowed_types']        = 'gif|jpg|png';
         $config['allowed_types']        = 'gif|jpg|png';
         $config['max_size']             = 20480; // Max file size: 20480 = 20M
         $config['max_size']             = 20480; // Max file size: 20480 = 20M
         $config['max_width']            = 2048;
         $config['max_width']            = 2048;
         $config['max_height']           = 2048;
         $config['max_height']           = 2048;
         $config['encrypt_name']         = TRUE;
         $config['encrypt_name']         = TRUE;
 
 
-        $ci =& get_instance();
         $ci->load->library('upload', $config);
         $ci->load->library('upload', $config);
-
         if ( ! $ci->upload->do_upload('file'))
         if ( ! $ci->upload->do_upload('file'))
             return NULL;
             return NULL;
         else
         else
-            return base_url('uploads/').$ci->upload->data('file_name');
+            return $ci->config->item('upload_prefix') . $ci->upload->data('file_name');
     }
     }
 }
 }
\ No newline at end of file

application/views/upload.php

+<?php
+/*
+| This is an example view to show how to use upload helper
+| amontejo@ujaen.es - 2020
+*/
+?>
 <form id="fileForm" action="<?= base_url('index.php/upload/upload') ?>" method="post" enctype="multipart/form-data">
 <form id="fileForm" action="<?= base_url('index.php/upload/upload') ?>" method="post" enctype="multipart/form-data">
     <div class="form-row">
     <div class="form-row">
         <br/>
         <br/>

index.php

@@ -53,7 +53,7 @@
  *
  *
  * NOTE: If you change these, also change the error_reporting() code below
  * NOTE: If you change these, also change the error_reporting() code below
  */
  */
-	define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'production');
+	define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'development');
 
 
 /*
 /*
  *---------------------------------------------------------------
  *---------------------------------------------------------------

index.php.bak

+<?php
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014 - 2019, British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package	CodeIgniter
+ * @author	EllisLab Dev Team
+ * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
+ * @copyright	Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
+ * @license	https://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ * @since	Version 1.0.0
+ * @filesource
+ */
+
+/*
+ *---------------------------------------------------------------
+ * APPLICATION ENVIRONMENT
+ *---------------------------------------------------------------
+ *
+ * You can load different configurations depending on your
+ * current environment. Setting the environment also influences
+ * things like logging and error reporting.
+ *
+ * This can be set to anything, but default usage is:
+ *
+ *     development
+ *     testing
+ *     production
+ *
+ * NOTE: If you change these, also change the error_reporting() code below
+ */
+	define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'development');
+
+/*
+ *---------------------------------------------------------------
+ * ERROR REPORTING
+ *---------------------------------------------------------------
+ *
+ * Different environments will require different levels of error reporting.
+ * By default development will show errors but testing and live will hide them.
+ */
+switch (ENVIRONMENT)
+{
+	case 'development':
+	case 'production':
+		error_reporting(-1);
+		ini_set('display_errors', 1);
+	break;
+
+	case 'testing':
+	//case 'production':
+		ini_set('display_errors', 0);
+		if (version_compare(PHP_VERSION, '5.3', '>='))
+		{
+			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
+		}
+		else
+		{
+			error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
+		}
+	break;
+
+	default:
+		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
+		echo 'The application environment is not set correctly.';
+		exit(1); // EXIT_ERROR
+}
+
+/*
+ *---------------------------------------------------------------
+ * SYSTEM DIRECTORY NAME
+ *---------------------------------------------------------------
+ *
+ * This variable must contain the name of your "system" directory.
+ * Set the path if it is not in the same directory as this file.
+ */
+	$system_path = 'system';
+
+/*
+ *---------------------------------------------------------------
+ * APPLICATION DIRECTORY NAME
+ *---------------------------------------------------------------
+ *
+ * If you want this front controller to use a different "application"
+ * directory than the default one you can set its name here. The directory
+ * can also be renamed or relocated anywhere on your server. If you do,
+ * use an absolute (full) server path.
+ * For more info please see the user guide:
+ *
+ * https://codeigniter.com/user_guide/general/managing_apps.html
+ *
+ * NO TRAILING SLASH!
+ */
+	$application_folder = 'application';
+
+/*
+ *---------------------------------------------------------------
+ * VIEW DIRECTORY NAME
+ *---------------------------------------------------------------
+ *
+ * If you want to move the view directory out of the application
+ * directory, set the path to it here. The directory can be renamed
+ * and relocated anywhere on your server. If blank, it will default
+ * to the standard location inside your application directory.
+ * If you do move this, use an absolute (full) server path.
+ *
+ * NO TRAILING SLASH!
+ */
+	$view_folder = '';
+
+
+/*
+ * --------------------------------------------------------------------
+ * DEFAULT CONTROLLER
+ * --------------------------------------------------------------------
+ *
+ * Normally you will set your default controller in the routes.php file.
+ * You can, however, force a custom routing by hard-coding a
+ * specific controller class/function here. For most applications, you
+ * WILL NOT set your routing here, but it's an option for those
+ * special instances where you might want to override the standard
+ * routing in a specific front controller that shares a common CI installation.
+ *
+ * IMPORTANT: If you set the routing here, NO OTHER controller will be
+ * callable. In essence, this preference limits your application to ONE
+ * specific controller. Leave the function name blank if you need
+ * to call functions dynamically via the URI.
+ *
+ * Un-comment the $routing array below to use this feature
+ */
+	// The directory name, relative to the "controllers" directory.  Leave blank
+	// if your controller is not in a sub-directory within the "controllers" one
+	// $routing['directory'] = '';
+
+	// The controller class file name.  Example:  mycontroller
+	// $routing['controller'] = '';
+
+	// The controller function you wish to be called.
+	// $routing['function']	= '';
+
+
+/*
+ * -------------------------------------------------------------------
+ *  CUSTOM CONFIG VALUES
+ * -------------------------------------------------------------------
+ *
+ * The $assign_to_config array below will be passed dynamically to the
+ * config class when initialized. This allows you to set custom config
+ * items or override any default config values found in the config.php file.
+ * This can be handy as it permits you to share one application between
+ * multiple front controller files, with each file containing different
+ * config values.
+ *
+ * Un-comment the $assign_to_config array below to use this feature
+ */
+	// $assign_to_config['name_of_config_item'] = 'value of config item';
+
+
+
+// --------------------------------------------------------------------
+// END OF USER CONFIGURABLE SETTINGS.  DO NOT EDIT BELOW THIS LINE
+// --------------------------------------------------------------------
+
+/*
+ * ---------------------------------------------------------------
+ *  Resolve the system path for increased reliability
+ * ---------------------------------------------------------------
+ */
+
+	// Set the current directory correctly for CLI requests
+	if (defined('STDIN'))
+	{
+		chdir(dirname(__FILE__));
+	}
+
+	if (($_temp = realpath($system_path)) !== FALSE)
+	{
+		$system_path = $_temp.DIRECTORY_SEPARATOR;
+	}
+	else
+	{
+		// Ensure there's a trailing slash
+		$system_path = strtr(
+			rtrim($system_path, '/\\'),
+			'/\\',
+			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
+		).DIRECTORY_SEPARATOR;
+	}
+
+	// Is the system path correct?
+	if ( ! is_dir($system_path))
+	{
+		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
+		echo 'Your system folder path does not appear to be set correctly. Please open the following file and correct this: '.pathinfo(__FILE__, PATHINFO_BASENAME);
+		exit(3); // EXIT_CONFIG
+	}
+
+/*
+ * -------------------------------------------------------------------
+ *  Now that we know the path, set the main path constants
+ * -------------------------------------------------------------------
+ */
+	// The name of THIS file
+	define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
+
+	// Path to the system directory
+	define('BASEPATH', $system_path);
+
+	// Path to the front controller (this file) directory
+	define('FCPATH', dirname(__FILE__).DIRECTORY_SEPARATOR);
+
+	// Name of the "system" directory
+	define('SYSDIR', basename(BASEPATH));
+
+	// The path to the "application" directory
+	if (is_dir($application_folder))
+	{
+		if (($_temp = realpath($application_folder)) !== FALSE)
+		{
+			$application_folder = $_temp;
+		}
+		else
+		{
+			$application_folder = strtr(
+				rtrim($application_folder, '/\\'),
+				'/\\',
+				DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
+			);
+		}
+	}
+	elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
+	{
+		$application_folder = BASEPATH.strtr(
+			trim($application_folder, '/\\'),
+			'/\\',
+			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
+		);
+	}
+	else
+	{
+		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
+		echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
+		exit(3); // EXIT_CONFIG
+	}
+
+	define('APPPATH', $application_folder.DIRECTORY_SEPARATOR);
+
+	// The path to the "views" directory
+	if ( ! isset($view_folder[0]) && is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
+	{
+		$view_folder = APPPATH.'views';
+	}
+	elseif (is_dir($view_folder))
+	{
+		if (($_temp = realpath($view_folder)) !== FALSE)
+		{
+			$view_folder = $_temp;
+		}
+		else
+		{
+			$view_folder = strtr(
+				rtrim($view_folder, '/\\'),
+				'/\\',
+				DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
+			);
+		}
+	}
+	elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
+	{
+		$view_folder = APPPATH.strtr(
+			trim($view_folder, '/\\'),
+			'/\\',
+			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
+		);
+	}
+	else
+	{
+		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
+		echo 'Your view folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
+		exit(3); // EXIT_CONFIG
+	}
+
+	define('VIEWPATH', $view_folder.DIRECTORY_SEPARATOR);
+
+/*
+ * --------------------------------------------------------------------
+ * LOAD THE BOOTSTRAP FILE
+ * --------------------------------------------------------------------
+ *
+ * And away we go...
+ */
+require_once BASEPATH.'core/CodeIgniter.php';