Changeset 735

Timestamp:

09/27/2007 06:19:45 AM (22 months ago)

Author:

JavaWoman

Message:

Wakka.class.php

• Some changes in (advanced) FormOpen() to handle GET parameters when rewrite_mode is off (to be extended later)
• minor cleanup

wikka.css

• added rule for class="hidden" (primarily intended for a fieldset wrapper for hidden fields, but more generally usable)

Fixes #563

Location:

trunk

Files:

• css/wikka.css (modified) (3 diffs)
• libs/Wakka.class.php (modified) (16 diffs)

trunk/css/wikka.css

@@ -7 +7 @@
 /* global styling */
 
-p, td, li, input, select, textarea {
+body {
         font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-        line-height: 20px;
         font-size: 13px;
-}
-
-form, h1, h2, h3, h4, h5 {
-        margin: 0px;
-        padding: 0px;
-}
-
-/* page layout */
-
-body {
-        font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;     font-size: 13px;
 /*      text-align: justify; */                 /* comment out this line if you really need justified text */
         line-height: 20px;
@@ -28 +16 @@
         margin: 0;
 }
+
+p, td, li, input, select, textarea {
+        font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+        line-height: 20px;
+        font-size: 13px;
+}
+
+form, h1, h2, h3, h4, h5 {
+        margin: 0px;
+        padding: 0px;
+}
+
+/* page layout */
 
 .header {
@@ -236 +237 @@
         color: #393;
         background-color: #EFE;
+}
+
+.hidden {
+        display: none;
 }
 

trunk/libs/Wakka.class.php

@@ -466 +466 @@
 
                 $errors = array();
-                $result = getMysqlVersion($errors);
+                $mysql_version = getMysqlVersion($errors);
 
                 // report any error encountered retrieving version (like in Query())
@@ -1015 +1015 @@
          * @return      string  converted string
          */
-         function hsc_secure($string, $quote_style=ENT_COMPAT)
-         {
-                // init
-                $aTransSpecchar = array('&' => '&',
-                                                                '"' => '"',
-                                                                '<' => '&lt;',
+        function hsc_secure($string, $quote_style=ENT_COMPAT)
+        {
+                // init
+                $aTransSpecchar = array('&' => '&amp;',
+                                                                '"' => '&quot;',
+                                                                '<' => '&lt;',
                                                                 '>' => '&gt;'
                                                                 );                      // ENT_COMPAT set
@@ -1035 +1035 @@
                 $result = strtr($string,$aTransSpecchar);
                 return $result;
-         }
+        }
 
         /**
@@ -2272 +2272 @@
                                 if ($debug)
                                 {
-                                        print($response);
+                                        print $response;
                                 }
                         }
@@ -2288 +2288 @@
          * @param       string  $user   mandatory:
          * @param       string  $changelog      optional:
-         * @return      mixed   either an array with the WikiPing-params or FALSE if there was an error
+         * @return      mixed   either an array with the WikiPing-params or FALSE
+         *                                      if retrieving one of the required parameters failed
          * @todo        move to a dedicated class (plugin)
          */
@@ -2939 +2940 @@
          *                      or without rewrite mode, and without this hidden field!
          */
-        /*
+        /* replaced by http://wikkawiki.org/AdvancedFormOpen
         function FormOpen($handler='', $tag='', $formMethod='post')
         {
@@ -2992 +2993 @@
         function FormOpen($handler='', $tag='', $formMethod='post', $id='', $class='', $file=FALSE)
         {
+                // init
                 $attrMethod = '';                                                                       // no method for HTML default 'get'
                 $attrClass = '';
                 $attrEnctype = '';                                                                      // default no enctype -> HTML default application/x-www-form-urlencoded
-                #$hiddenval = '';
+                $hidden = array();
                 // derivations
                 $handler = trim($handler);
@@ -3004 +3006 @@
                 #$validHandler = $this->existsHandler($handler);
                 #$validPage = $this->existsPage($tag);
+                // validation needed only if parameters are actually specified
                 #$handler = ($validHandler) ? $handler : '';
                 if (!empty($handler) && !$this->existsHandler($handler))
@@ -3010 +3013 @@
                 }
                 #$tag = ($validPage) ? $tag : '';
-                // @@@ handle complete URL instead of page name here (or as separate param)
                 if (!empty($tag) && !$this->existspage($tag))
                 {
@@ -3017 +3019 @@
                 
                 // form action (action is a required attribute!)
-                // @@@ handle complete URL instead of handler/pagename here
-                $attrAction = ' action="'.$this->Href($handler, $tag).'"';
+                // !!! If rewrite mode is off, "tag" has to be passed as a hidden field
+                // rather than part of the URL (where it gets ignored on submit!)
+                if ($this->GetConfigValue('rewrite_mode'))
+                {
+                        // @@@ add passed extra GET params here by passing them as extra
+                        // parameter to Href()
+                        $attrAction = ' action="'.$this->Href($handler, $tag).'"';
+                }
+                else
+                {
+                        $attrAction = ' action="'.$this->Href($handler).'"';
+                        $hidden['wakka'] = ('' != $tag) ? $tag : $this->tag;
+                        // @@@ add passed extra GET params here by adding them as extra
+                        // entries to $hidden (probably not by adding them to Href()
+                        // but that needs to be tested when we get to it!)
+                }
                 // form method (ignore anything but post) and enctype
                 if (TRUE === $file)
@@ -3042 +3058 @@
 
                 // build HTML fragment
-                $result = '<form'.$attrAction.$attrMethod.$attrEnctype.$attrId.$attrClass.'>'."\n";
-                #if (!$this->config['rewrite_mode'])                                    # is this bit really necessary?
-                #{
-                #       $hiddenval = $this->MiniHref($method, $page);
-                #       $result .= '<fieldset class="hidden"><input type="hidden" name="wakka" value="'.$hiddenval.'" /></fieldset>'."\n";
-                #}
-
-                return $result;
+                $fragment = '<form'.$attrAction.$attrMethod.$attrEnctype.$attrId.$attrClass.'>'."\n";
+                // construct and add hidden fields (necessary if we are NOT using rewrite mode)
+                if (count($hidden) > 0)
+                {
+                        $fragment .= '<fieldset class="hidden">'."\n";
+                        foreach ($hidden as $name => $value)
+                        {
+                                $fragment .= '  <input type="hidden" name="'.$name.'" value="'.$value.'" />'."\n";
+                        }
+                        $fragment .= '</fieldset>'."\n";
+                }
+
+                // return resulting HTML fragment
+                return $fragment;
         }
         /**
@@ -3103 +3125 @@
          * Return the full URL of an interwiki for a given shortcut, if in the list.
          *
-         * @param  string $name mandatory: the shortcut for the interWiki
+         * @param  string $name mandatory: the shortcut for the interWiki
          * @param  string $tag  mandatory: name of a page in the other wiki
          * @return string the full URL for $tag or an empty string
@@ -3131 +3153 @@
                 if (!$tag = trim($tag))
                 {
-                        $tag = $this->GetPageTag();
+                        #$tag = $this->GetPageTag();
+                        $tag = $this->tag;
                 }
                 if (!$referrer = trim($referrer))
@@ -3389 +3412 @@
                 return $out;
         }
+
         /**
          * Add a custom header(s) to be inserted inside the <head> section.
@@ -4387 +4411 @@
          *
          * @uses        Wakka::GetConfigValue()
-         * @uses        Wakka::GetConfigValue()
          * @uses        Wakka::LoadSingle()
          *
@@ -4590 +4613 @@
 
         /**
-         * Determine if the current user has specified access for the specified page.
+         * Determine if the (current) user has specified access for the specified page.
          *
          * Returns true if $username (defaults to current user) has $privilege