/ - Diff - celutz - tetaneutral.net

+    			}
+    		}
     		$this->sanitized = $sanitized;
     		return ($err == false);
     		return (count($this->errors) == 0);
+    	}
     	public function validate_field($validator, $content) {
-...
     		return $this->sanitized;
+    	}
     	public function print_errors() {
     		/** raw & quick HTML errors printing, for case that shouldn't happen to users.
     		 */
     		echo '<pre>';
     		var_dump($this->errors());
     		echo '</pre>';
+    	}
     	public static function register($name, $function) {
     		self::$field_validators[$name] = $function;
+    	}
-...
+      }
     );
     // Validate that it is not a file path
     FormValidator::register(
       'basename',
       function ($v) {
     	  if (!strpos($v, '/') && !strpos($v, '\\')) {
     		  return $v;
     	  } else {
     		  throw new FieldValidationError('est un chemin');
+    	  }
+      }
     );
     ?>

class/site_point.class.php
27	27	return $this->base_dir.'/'.$this->prefix.'.params';
28	28	}
29	29
	30	public function tiles_url_prefix() {
	31	return PANORAMA_FOLDER.'/'.$this->prefix;
	32	}
	33
30	34	public function tiles_path() {
31	35	return $this->base_dir;
32	36	}

     <?php
     require_once 'class/utils.class.php';
     require_once 'class/site_point.class.php';
     require_once 'class/TilesGenerator.php';
     require_once 'constants.inc.php';
     $fields_spec = array(
       'name'   => array('required', 'basename'), // name of the field within uploads dir
       'wizard' => array('boolean')
     );
     $validator = new FormValidator($fields_spec);
     $is_valid = $validator->validate($_GET);
     if ($is_valid) {
       $input = $validator->sane_values();
+    }
     ?>
     <!DOCTYPE html>
     <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
     <head>
-...
     </head>
     <body>
     <?php
     require_once 'class/utils.class.php';
     require_once 'class/site_point.class.php';
     require_once 'class/TilesGenerator.php';
     require_once 'constants.inc.php';
     if (isset($_GET['name'])) {
       $image_path = UPLOAD_PATH.'/'.$_GET['name'];
     <?
     if ($is_valid) {
       $image_path = UPLOAD_PATH.'/'.$input['name'];
       // We init the panorama with the same name as image.
       $pano_name = utils::strip_extension($_GET['name']);
       $pano_name = utils::strip_extension($input['name']);
       $panorama = site_point::get($pano_name);
       $tiles_generator = new TilesGenerator($image_path, $panorama);
-...
         // Redirect in js to sumary page
         if ($_GET['wizard']) {
         if ($input['wizard']) {
           printf('<script>window.location=\'panoInfo.php?name=%s\'</script>\n', $pano_name);
+        }
-...
         printf("<h4><span class=\"error\">%s</span></h4>\n", $e->getMessage());
         print("</pre>\n");
+      }
     } else {
       $validator->print_errors();
+    }
     ?>
     </body>

     <?php
     require_once 'class/site_point.class.php';
     require_once('class/site_point.class.php');
     require_once('class/FormValidator.class.php');
     $fields_spec = array('name' => array('required', 'basename'));
     $validator = new FormValidator($fields_spec);
     $is_valid = $validator->validate($_GET);
     $pano = site_point::get($_GET['name']);
     if ($pano->has_params()) {
       $params = $pano->get_params();
       $title = $params['titre'];
       $lat = $params['latitude'];
       $lon = $params['longitude'];
     } else {
       $title = $__GET['name'];
+    }
     if ($is_valid) {
       $input = $validator->sane_values();
       $pano = site_point::get($input['name']);
       if ($pano->has_params()) {
         $params = $pano->get_params();
         $title = $params['titre'];
         $lat = $params['latitude'];
         $lon = $params['longitude'];
       } else {
         $title = $input['name'];
+      }
     $has_tiles = $pano->has_tiles();//TODO
     $has_params = $pano->has_params();
     $src_path = $pano->src_path();
       $has_tiles = $pano->has_tiles();//TODO
       $has_params = $pano->has_params();
       $src_path = $pano->src_path();
     } else {
       $validation_errors = $validator->errors();
+    }
      ?>
     <!DOCTYPE html>
-...
           <h1><img src="images/tetaneutral.svg" alt="tetaneutral.net"/></h1>
         </header>
         <section id="main">
     <?php if ($is_valid) { ?>
           <h2><?php echo $title ?></h2>
           <ul id="pano-list">
             <li>
-...
               <?php } ?>
             </li>
           </ul>
     <?php } else {
       $validator->print_errors();
     }?>
         </section>
         <footer class="validators"><samp>
           page validée par

        require 'class/utils.class.php';
        require_once 'constants.inc.php';
       $fields_spec = array(
         'panorama'   => array('basename'),
         'dir'        => array(),//fixme
         'to_cap'     => array('numeric'),
         'to_ele'     => array('numeric'),
         'to_zoom'     => array('numeric')
       );
       $validator = new FormValidator($fields_spec);
       $is_valid = $validator->validate($_GET);
       if ($is_valid) {
         $input = $validator->sane_values();
       } else {
         $validator->print_errors();
         die();//fixme, could be cleaner
+      }
        $form_extpoint = file_get_contents('html/form_extpoint.html');
        $form_param = file_get_contents('html/form_param.html');
        if (isset($_GET['dir']) && isset($_GET['panorama'])) {
          $dir   = $_GET['dir'];
          $name  = $_GET['panorama'];
        if (isset($input['dir']) && isset($input['panorama'])) {
          $dir   = $input['dir'];
          $name  = $input['panorama'];
        } else {
          $dir   = PANORAMA_PATH;
          $name  = 'ttn_mediatheque';
+       }
        $opt_vals = array();
        foreach(array('to_cap', 'to_ele', 'to_zoom') as $val) {
          if (!empty($_GET[$val])) $opt_vals[$val] = $_GET[$val];
          if (!empty($input[$val])) $opt_vals[$val] = $input[$val];
+       }
        $base_dir = $dir.'/'.$name;
        $pt = new site_point($base_dir);
        $pt = site_point::get($input['panorama']);
        $base_dir = $pt->tiles_url_prefix();
        if(!$pt) die("impossible d'accéder à ".$base_dir." !\n");
        $params = $pt->get_params();
        $prefix = $pt->get_prefix();
-...
            print("</div>\n");
            echo $form_extpoint;
          } elseif ($params == false ) {
          	$dir   = $_GET['dir'];
             $name  = $_GET['panorama'];
          	$dir   = $input['dir'];
             $name  = $input['panorama'];
             printf($form_param, $name, $name);
+         }
          echo '<p id="info"></p>'."\n";

Projet

Général

Profil

Révision 6156a9b6

Ajouté par Jocelyn Delande il y a presque 11 ans