WebSVN – Applications.papyrus – Diff – //trunk/api/pear/Pager/Common.php

 /**
  * Two constants used to guess the path- and file-name of the page
  * when the user doesn't set any other value
  */
 if (substr($_SERVER['PHP_SELF'], -1) == '/') {
+    $http = !empty($_SERVER['HTTPS']) ? 'https://' : 'http://';
     define('CURRENT_FILENAME', '');
-    define('CURRENT_PATHNAME', 'http://'.$_SERVER['HTTP_HOST'].str_replace('\\', '/', $_SERVER['PHP_SELF']));
+    define('CURRENT_PATHNAME', $http.$_SERVER['HTTP_HOST'].str_replace('\\', '/', $_SERVER['PHP_SELF']));
 } else {
     define('CURRENT_FILENAME', preg_replace('/(.*)\?.*/', '\\1', basename($_SERVER['PHP_SELF'])));
     define('CURRENT_PATHNAME', str_replace('\\', '/', dirname($_SERVER['PHP_SELF'])));
+}
 /**
     /**
      * @var string extra attributes for the <a> tag
      * @access private
      */
     var $_attributes  = '';
+    /**
+     * @var string onclick
+     * @access private
+     */
+    var $_onclick = '';
     /**
      * @var string alt text for "first page" (use "%d" placeholder for page number)
      * @access private
         'prevImg',
         'nextImg',
         'expanded',
         'accesskey',
         'attributes',
+        'onclick',
         'separator',
         'spacesBeforeSeparator',
         'spacesAfterSeparator',
         'curPageLinkClassName',
         'curPageSpanPre',
         'currentPage',
     );
     // }}}
     // {{{ build()
     /**
      * Generate or refresh the links and paged data after a call to setOptions()
+     *
      * @access public
      */
     function build()
+    {
+        //reset
+        $this->_pageData = array();
+        $this->links = '';
-    {
+        $this->_generatePageData();
+        $this->_setFirstLastText();
-        $msg = '<b>PEAR::Pager Error:</b>'
+        if ($this->_totalPages > (2 * $this->_delta + 1)) {
+            $this->links .= $this->_printFirstPage();
+        }
+        $this->links .= $this->_getBackLink();
+        $this->links .= $this->_getPageLinks();
+        $this->links .= $this->_getNextLink();
+        $this->linkTags .= $this->_getFirstLinkTag();
+        $this->linkTags .= $this->_getPrevLinkTag();
+        $this->linkTags .= $this->_getNextLinkTag();
+        $this->linkTags .= $this->_getLastLinkTag();
-              .' function "build()" not implemented.';
+        if ($this->_totalPages > (2 * $this->_delta + 1)) {
+            $this->links .= $this->_printLastPage();
         return $this->raiseError($msg, ERROR_PAGER_NOT_IMPLEMENTED);
+    }
             if ($this->_append) {
                 $href = '?' . $this->_http_build_query_wrapper($this->_linkData);
             } else {
                 $href = str_replace('%d', $this->_linkData[$this->_urlVar], $this->_fileName);
+            }
+            $onclick = '';
+            if (array_key_exists($this->_urlVar, $this->_linkData)) {
+                $onclick = str_replace('%d', $this->_linkData[$this->_urlVar], $this->_onclick);
+            }
-            return sprintf('<a href="%s"%s%s%s title="%s">%s</a>',
+            return sprintf('<a href="%s"%s%s%s%s title="%s">%s</a>',
                            htmlentities($this->_url . $href),
                            empty($this->_classString) ? '' : ' '.$this->_classString,
                            empty($this->_attributes)  ? '' : ' '.$this->_attributes,
                            empty($this->_accesskey)   ? '' : ' accesskey="'.$this->_linkData[$this->_urlVar].'"',
+                           empty($onclick)            ? '' : ' onclick="'.$onclick.'"',
                            $altText,
                            $linkText
             );
         } elseif ($this->_httpMethod == 'POST') {
             return sprintf("<a href='javascript:void(0)' onclick='%s'%s%s%s title='%s'>%s</a>",
                 $qs = $_POST;
             } elseif ($this->_httpMethod == 'GET') {
                 $qs = $_GET;
+            }
+        }
-        if (count($this->_extraVars)){
-            $this->_recursive_urldecode($this->_extraVars);
-        }
-        $qs = array_merge($qs, $this->_extraVars);
         foreach ($this->_excludeVars as $exclude) {
             if (array_key_exists($exclude, $qs)) {
                 unset($qs[$exclude]);
+            }
+        }
+        if (count($this->_extraVars)){
+            $this->_recursive_urldecode($this->_extraVars);
+            $qs = array_merge($qs, $this->_extraVars);
+        }
         if (count($qs) && get_magic_quotes_gpc()){
             $this->_recursive_stripslashes($qs);
+        }
         return $qs;
+    }
      * @access private
      */
     function __http_build_query($array, $name)
+    {
         $tmp = array ();
+        $separator = ini_get('arg_separator.output');
+        if ($separator == '&amp;') {
+            $separator = '&'; //the string is escaped by htmlentities anyway...
+        }
         foreach ($array as $key => $value) {
             if (is_array($value)) {
                 //array_push($tmp, $this->__http_build_query($value, sprintf('%s[%s]', $name, $key)));
                 array_push($tmp, $this->__http_build_query($value, $name.'%5B'.$key.'%5D'));
             } elseif (is_scalar($value)) {
             } elseif (is_object($value)) {
                 //array_push($tmp, $this->__http_build_query(get_object_vars($value), sprintf('%s[%s]', $name, $key)));
                 array_push($tmp, $this->__http_build_query(get_object_vars($value), $name.'%5B'.$key.'%5D'));
+            }
+        }
-        return implode(ini_get('arg_separator.output'), $tmp);
+        return implode($separator, $tmp);
+    }
     // }}}
         } else {
             $this->_url = $this->_path;
             if (strncasecmp($this->_fileName, 'javascript', 10) != 0) {
                 $this->_url .= '/';
+            }
-            if (!strstr($this->_fileName, '%d')) {
+            if (strpos($this->_fileName, '%d') === false) {
                 trigger_error($this->errorMessage(ERROR_PAGER_INVALID_USAGE), E_USER_WARNING);
+            }
+        }

Subversion Repositories Applications.papyrus

(root)//trunk/api/pear/Pager/Common.php – Rev 848 → 1713