Author: deepak
Date: Tue Aug 29 10:19:35 2017
New Revision: 1806551
URL: http://svn.apache.org/viewvc?rev=1806551&view=rev
Log:
Remvoed tab character from php files
Modified:
ofbiz/site/js-plugin/ajax-contact-extend/classes/contact.php
ofbiz/site/js-plugin/ajax-contact-extend/classes/image.php
ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter.php
ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiCurl.php
ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiOAuth.php
ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiTwitter.php
ofbiz/site/template/page/about-ofbiz.tpl.php
ofbiz/site/template/page/business-users.tpl.php
ofbiz/site/template/page/developers.tpl.php
ofbiz/site/template/page/download.tpl.php
ofbiz/site/template/page/faqs.tpl.php
ofbiz/site/template/page/getting-involved.tpl.php
ofbiz/site/template/page/index.tpl.php
ofbiz/site/template/page/mailinglists.tpl.php
ofbiz/site/template/page/ofbiz-demos.tpl.php
ofbiz/site/template/page/our-users.tpl.php
ofbiz/site/template/page/service-providers.tpl.php
ofbiz/site/template/page/source-repository.tpl.php
ofbiz/site/template/region/footer.tpl.php
ofbiz/site/template/region/header.tpl.php
Modified: ofbiz/site/js-plugin/ajax-contact-extend/classes/contact.php
URL:
http://svn.apache.org/viewvc/ofbiz/site/js-plugin/ajax-contact-extend/classes/contact.php?rev=1806551&r1=1806550&r2=1806551&view=diff
==============================================================================
--- ofbiz/site/js-plugin/ajax-contact-extend/classes/contact.php (original)
+++ ofbiz/site/js-plugin/ajax-contact-extend/classes/contact.php Tue Aug 29
10:19:35 2017
@@ -45,7 +45,7 @@ $secret = "";
$postValues = array();
foreach ( $_POST as $name => $value ) {
- $postValues[$name] = trim( $value );
+ $postValues[$name] = trim( $value );
}
extract( $postValues );
@@ -70,7 +70,7 @@ $error = '';
////////////////////////
// Name field is required
if ( empty( $name ) ) {
- $error .= '<li>Your name is required.</li>';
+ $error .= '<li>Your name is required.</li>';
}
////////////////////////
@@ -78,9 +78,9 @@ if ( empty( $name ) ) {
////////////////////////
// Email field is required
if ( empty( $email ) ) {
- $error .= '<li>Your e-mail address is required.</li>';
+ $error .= '<li>Your e-mail address is required.</li>';
} elseif ( !isEmail( $email ) ) {
- $error .= '<li>You have entered an invalid e-mail address.</li>';
+ $error .= '<li>You have entered an invalid e-mail address.</li>';
}
////////////////////////
@@ -88,9 +88,9 @@ if ( empty( $email ) ) {
////////////////////////
// Phone field is required
if ( empty( $phone ) ) {
- $error .= '<li>Your phone number is required.</li>';
+ $error .= '<li>Your phone number is required.</li>';
} elseif ( !is_numeric( $phone ) ) {
- $error .= '<li>Your phone number can only contain digits.</li>';
+ $error .= '<li>Your phone number can only contain digits.</li>';
}
////////////////////////
@@ -98,7 +98,7 @@ if ( empty( $phone ) ) {
////////////////////////
// Comments field is required
if ( empty( $comments ) ) {
- $error .= '<li>You must enter a message to send.</li>';
+ $error .= '<li>You must enter a message to send.</li>';
}
////////////////////////
@@ -106,7 +106,7 @@ if ( empty( $comments ) ) {
////////////////////////
// Agree to terms checkbox is required
if ( empty( $agree ) ) {
- $error .= '<li>You must agree to our terms.</li>';
+ $error .= '<li>You must agree to our terms.</li>';
}
////////////////////////
@@ -114,17 +114,17 @@ if ( empty( $agree ) ) {
////////////////////////
// Verification code is required
if ( $session_verify != $posted_verify ) {
- $error .= '<li>The verification code you entered is incorrect.</li>';
+ $error .= '<li>The verification code you entered is incorrect.</li>';
}
////////////////////////
if ( !empty($error) ) {
- echo '<div class="error_message">Attention! Please correct the errors
below and try again.';
- echo '<ul class="error_messages">' . $error . '</ul>';
- echo '</div>';
+ echo '<div class="error_message">Attention! Please correct the errors below
and try again.';
+ echo '<ul class="error_messages">' . $error . '</ul>';
+ echo '</div>';
- // Important to have return false in here.
- return false;
+ // Important to have return false in here.
+ return false;
}
@@ -146,8 +146,8 @@ $msg .= "-------------------------------
if ( $twitter_active == 1 ) {
- $twitter_msg = $name . " - " . $comments . ". You can contact " . $name
. " via email, " . $email ." or via phone " . $phone . ".";
- twittermessage( $twitter_user, $twitter_msg, $consumer_key,
$consumer_secret, $token, $secret );
+ $twitter_msg = $name . " - " . $comments . ". You can contact " . $name . "
via email, " . $email ." or via phone " . $phone . ".";
+ twittermessage( $twitter_user, $twitter_msg, $consumer_key,
$consumer_secret, $token, $secret );
}
@@ -161,15 +161,15 @@ $headers .= "Content-Transfer-Encoding:
if ( mail( $address, $e_subject, $msg, $headers ) ) {
- echo "<fieldset>";
- echo "<div id='success_page'>";
- echo "<h1>Email Sent Successfully.</h1>";
- echo "<p>Thank you <strong>$name</strong>, your message has been
submitted to us.</p>";
- echo "</div>";
- echo "</fieldset>";
+ echo "<fieldset>";
+ echo "<div id='success_page'>";
+ echo "<h1>Email Sent Successfully.</h1>";
+ echo "<p>Thank you <strong>$name</strong>, your message has been submitted
to us.</p>";
+ echo "</div>";
+ echo "</fieldset>";
- // Important to have return false in here.
- return false;
+ // Important to have return false in here.
+ return false;
}
@@ -184,21 +184,21 @@ return false;
function twittermessage( $user, $message, $consumer_key, $consumer_secret,
$token, $secret ) { // Twitter Direct Message function, do not edit.
- require_once 'twitter/EpiCurl.php';
- require_once 'twitter/EpiOAuth.php';
- require_once 'twitter/EpiTwitter.php';
+ require_once 'twitter/EpiCurl.php';
+ require_once 'twitter/EpiOAuth.php';
+ require_once 'twitter/EpiTwitter.php';
- $Twitter = new EpiTwitter( $consumer_key, $consumer_secret );
- $Twitter->setToken( $token, $secret );
+ $Twitter = new EpiTwitter( $consumer_key, $consumer_secret );
+ $Twitter->setToken( $token, $secret );
- $direct_message = $Twitter->post_direct_messagesNew( array( 'user' =>
$user, 'text' => $message ) );
- $tweet_info = $direct_message->responseText;
+ $direct_message = $Twitter->post_direct_messagesNew( array( 'user' => $user,
'text' => $message ) );
+ $tweet_info = $direct_message->responseText;
}
function isEmail( $email ) { // Email address verification, do not edit.
- return preg_match(
"/^[-_.[:alnum:]]+@((([[:alnum:]]|[[:alnum:]][[:alnum:]-]*[[:alnum:]])\.)+(ad|ae|aero|af|ag|ai|al|am|an|ao|aq|ar|arpa|as|at|au|aw|az|ba|bb|bd|be|bf|bg|bh|bi|biz|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|com|coop|cr|cs|cu|cv|cx|cy|cz|de|dj|dk|dm|do|dz|ec|edu|ee|eg|eh|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gh|gi|gl|gm|gn|gov|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|in|info|int|io|iq|ir|is|it|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|mil|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|museum|mv|mw|mx|my|mz|na|name|nc|ne|net|nf|ng|ni|nl|no|np|nr|nt|nu|nz|om|org|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|pro|ps|pt|pw|py|qa|re|ro|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|st|su|sv|sy|sz|tc|td|tf|tg|th|tj|tk|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|um|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|za|zm|zw)$|(([0-9][0-9]?|[0-1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-5])\.){3}([0-9][0-9]?|[0-1][0-9][0-9]|[2][0-
4][0-9]|[2][5][0-5]))$/i", $email );
+ return preg_match(
"/^[-_.[:alnum:]]+@((([[:alnum:]]|[[:alnum:]][[:alnum:]-]*[[:alnum:]])\.)+(ad|ae|aero|af|ag|ai|al|am|an|ao|aq|ar|arpa|as|at|au|aw|az|ba|bb|bd|be|bf|bg|bh|bi|biz|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|com|coop|cr|cs|cu|cv|cx|cy|cz|de|dj|dk|dm|do|dz|ec|edu|ee|eg|eh|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gh|gi|gl|gm|gn|gov|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|in|info|int|io|iq|ir|is|it|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|mil|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|museum|mv|mw|mx|my|mz|na|name|nc|ne|net|nf|ng|ni|nl|no|np|nr|nt|nu|nz|om|org|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|pro|ps|pt|pw|py|qa|re|ro|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|st|su|sv|sy|sz|tc|td|tf|tg|th|tj|tk|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|um|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|za|zm|zw)$|(([0-9][0-9]?|[0-1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-5])\.){3}([0-9][0-9]?|[0-1][0-9][0-9]|[2][0
-4][0-9]|[2][5][0-5]))$/i", $email );
}
?>
Modified: ofbiz/site/js-plugin/ajax-contact-extend/classes/image.php
URL:
http://svn.apache.org/viewvc/ofbiz/site/js-plugin/ajax-contact-extend/classes/image.php?rev=1806551&r1=1806550&r2=1806551&view=diff
==============================================================================
--- ofbiz/site/js-plugin/ajax-contact-extend/classes/image.php (original)
+++ ofbiz/site/js-plugin/ajax-contact-extend/classes/image.php Tue Aug 29
10:19:35 2017
@@ -10,9 +10,9 @@ $_SESSION['jigowatt']['ajax-extended-for
// Verification Image Background Selection
$dir = dirname( dirname( __FILE__ ) ) . '/assets/';
$bgs = array(
- $dir . 'img/verify/1.png',
- $dir . 'img/verify/2.png',
- $dir . 'img/verify/3.png'
+ $dir . 'img/verify/1.png',
+ $dir . 'img/verify/2.png',
+ $dir . 'img/verify/3.png'
);
$background = array_rand( $bgs, 1 );
Modified: ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter.php
URL:
http://svn.apache.org/viewvc/ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter.php?rev=1806551&r1=1806550&r2=1806551&view=diff
==============================================================================
--- ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter.php (original)
+++ ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter.php Tue Aug 29
10:19:35 2017
@@ -2,37 +2,37 @@
<head>
</head>
<body>
- <h2>Send Direct Messages on Twitter</h2>
+ <h2>Send Direct Messages on Twitter</h2>
- <?php if (!isset($_POST['submit'])) { ?>
- <form method="post" action="<?php echo
htmlentities($_SERVER['PHP_SELF']); ?>">
- Direct message: <br/>
- <textarea name="message" cols="15"></textarea><br/>
- <input type="submit" name="submit" value="Send" />
- </form>
-
- <?php } else {
-
- function twittermessage($user,$pass,$message) {
- $url = "http://twitter.com/direct_messages/new.xml";;
- $ch = curl_init();
- curl_setopt($ch, CURLOPT_HTTP_VERSION,
CURL_HTTP_VERSION_1_1);
- curl_setopt($ch, CURLOPT_USERPWD, "$user:$pass");
- curl_setopt($ch, CURLOPT_URL,$url);
- curl_setopt($ch, CURLOPT_POST, 1);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
- curl_setopt($ch,
CURLOPT_POSTFIELDS,"user=$user&text=$message");
- $results = curl_exec ($ch);
- curl_close ($ch);
- }
-
- $user = "jigowatt";
- $pass = "xxxxxx";
- $message = $_POST['message'];
+ <?php if (!isset($_POST['submit'])) { ?>
+ <form method="post" action="<?php echo htmlentities($_SERVER['PHP_SELF']);
?>">
+ Direct message: <br/>
+ <textarea name="message" cols="15"></textarea><br/>
+ <input type="submit" name="submit" value="Send" />
+ </form>
+
+ <?php } else {
+
+ function twittermessage($user,$pass,$message) {
+ $url = "http://twitter.com/direct_messages/new.xml";;
+ $ch = curl_init();
+ curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+ curl_setopt($ch, CURLOPT_USERPWD, "$user:$pass");
+ curl_setopt($ch, CURLOPT_URL,$url);
+ curl_setopt($ch, CURLOPT_POST, 1);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_POSTFIELDS,"user=$user&text=$message");
+ $results = curl_exec ($ch);
+ curl_close ($ch);
+ }
+
+ $user = "jigowatt";
+ $pass = "xxxxxx";
+ $message = $_POST['message'];
- twittermessage($user,$pass,$message);
+ twittermessage($user,$pass,$message);
- }
- ?>
+ }
+ ?>
</body>
</html>
\ No newline at end of file
Modified: ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiCurl.php
URL:
http://svn.apache.org/viewvc/ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiCurl.php?rev=1806551&r1=1806550&r2=1806551&view=diff
==============================================================================
--- ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiCurl.php
(original)
+++ ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiCurl.php Tue
Aug 29 10:19:35 2017
@@ -13,93 +13,93 @@ class EpiCurl
function __construct()
{
- if(self::$singleton == 0)
- {
- throw new Exception('This class cannot be instantiated by the new
keyword. You must instantiate it using: $obj = EpiCurl::getInstance();');
- }
-
- $this->mc = curl_multi_init();
- $this->properties = array(
- 'code' => CURLINFO_HTTP_CODE,
- 'time' => CURLINFO_TOTAL_TIME,
- 'length'=> CURLINFO_CONTENT_LENGTH_DOWNLOAD,
- 'type' => CURLINFO_CONTENT_TYPE
- );
+ if(self::$singleton == 0)
+ {
+ throw new Exception('This class cannot be instantiated by the new keyword.
You must instantiate it using: $obj = EpiCurl::getInstance();');
+ }
+
+ $this->mc = curl_multi_init();
+ $this->properties = array(
+ 'code' => CURLINFO_HTTP_CODE,
+ 'time' => CURLINFO_TOTAL_TIME,
+ 'length'=> CURLINFO_CONTENT_LENGTH_DOWNLOAD,
+ 'type' => CURLINFO_CONTENT_TYPE
+ );
}
public function addCurl($ch)
{
- $key = (string)$ch;
- $this->requests[$key] = $ch;
+ $key = (string)$ch;
+ $this->requests[$key] = $ch;
- $res = curl_multi_add_handle($this->mc, $ch);
+ $res = curl_multi_add_handle($this->mc, $ch);
- // (1)
- if($res === CURLM_OK || $res === CURLM_CALL_MULTI_PERFORM)
- {
- do {
- $mrc = curl_multi_exec($this->mc, $active);
- } while ($mrc === CURLM_CALL_MULTI_PERFORM);
-
- return new EpiCurlManager($key);
- }
- else
- {
- return $res;
- }
+ // (1)
+ if($res === CURLM_OK || $res === CURLM_CALL_MULTI_PERFORM)
+ {
+ do {
+ $mrc = curl_multi_exec($this->mc, $active);
+ } while ($mrc === CURLM_CALL_MULTI_PERFORM);
+
+ return new EpiCurlManager($key);
+ }
+ else
+ {
+ return $res;
+ }
}
public function getResult($key = null)
{
- if($key != null)
- {
- if(isset($this->responses[$key]))
- {
- return $this->responses[$key];
- }
-
- $running = null;
- do
- {
- $resp = curl_multi_exec($this->mc, $runningCurrent);
- if($running !== null && $runningCurrent != $running)
- {
- $this->storeResponses($key);
- if(isset($this->responses[$key]))
- {
- return $this->responses[$key];
- }
- }
- $running = $runningCurrent;
- }while($runningCurrent > 0);
- }
+ if($key != null)
+ {
+ if(isset($this->responses[$key]))
+ {
+ return $this->responses[$key];
+ }
+
+ $running = null;
+ do
+ {
+ $resp = curl_multi_exec($this->mc, $runningCurrent);
+ if($running !== null && $runningCurrent != $running)
+ {
+ $this->storeResponses($key);
+ if(isset($this->responses[$key]))
+ {
+ return $this->responses[$key];
+ }
+ }
+ $running = $runningCurrent;
+ }while($runningCurrent > 0);
+ }
- return false;
+ return false;
}
private function storeResponses()
{
- while($done = curl_multi_info_read($this->mc))
- {
- $key = (string)$done['handle'];
- $this->responses[$key]['data'] =
curl_multi_getcontent($done['handle']);
- foreach($this->properties as $name => $const)
- {
- $this->responses[$key][$name] = curl_getinfo($done['handle'],
$const);
- curl_multi_remove_handle($this->mc, $done['handle']);
- }
- }
+ while($done = curl_multi_info_read($this->mc))
+ {
+ $key = (string)$done['handle'];
+ $this->responses[$key]['data'] = curl_multi_getcontent($done['handle']);
+ foreach($this->properties as $name => $const)
+ {
+ $this->responses[$key][$name] = curl_getinfo($done['handle'], $const);
+ curl_multi_remove_handle($this->mc, $done['handle']);
+ }
+ }
}
static function getInstance()
{
- if(self::$inst == null)
- {
- self::$singleton = 1;
- self::$inst = new EpiCurl();
- }
+ if(self::$inst == null)
+ {
+ self::$singleton = 1;
+ self::$inst = new EpiCurl();
+ }
- return self::$inst;
+ return self::$inst;
}
}
@@ -110,14 +110,14 @@ class EpiCurlManager
function __construct($key)
{
- $this->key = $key;
- $this->epiCurl = EpiCurl::getInstance();
+ $this->key = $key;
+ $this->epiCurl = EpiCurl::getInstance();
}
function __get($name)
{
- $responses = $this->epiCurl->getResult($this->key);
- return $responses[$name];
+ $responses = $this->epiCurl->getResult($this->key);
+ return $responses[$name];
}
}
Modified: ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiOAuth.php
URL:
http://svn.apache.org/viewvc/ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiOAuth.php?rev=1806551&r1=1806550&r2=1806551&view=diff
==============================================================================
--- ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiOAuth.php
(original)
+++ ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiOAuth.php Tue
Aug 29 10:19:35 2017
@@ -14,197 +14,197 @@ class EpiOAuth
public function getAccessToken()
{
- $resp = $this->httpRequest('GET', $this->accessTokenUrl);
- return new EpiOAuthResponse($resp);
+ $resp = $this->httpRequest('GET', $this->accessTokenUrl);
+ return new EpiOAuthResponse($resp);
}
public function getAuthorizationUrl()
{
- $retval = "{$this->authorizeUrl}?";
+ $retval = "{$this->authorizeUrl}?";
- $token = $this->getRequestToken();
- return $this->authorizeUrl . '?oauth_token=' . $token->oauth_token;
+ $token = $this->getRequestToken();
+ return $this->authorizeUrl . '?oauth_token=' . $token->oauth_token;
}
public function getRequestToken()
{
- $resp = $this->httpRequest('GET', $this->requestTokenUrl);
- return new EpiOAuthResponse($resp);
+ $resp = $this->httpRequest('GET', $this->requestTokenUrl);
+ return new EpiOAuthResponse($resp);
}
public function httpRequest($method = null, $url = null, $params = null)
{
- if(empty($method) || empty($url))
- return false;
+ if(empty($method) || empty($url))
+ return false;
- if(empty($params['oauth_signature']))
- $params = $this->prepareParameters($method, $url, $params);
+ if(empty($params['oauth_signature']))
+ $params = $this->prepareParameters($method, $url, $params);
- switch($method)
- {
- case 'GET':
- return $this->httpGet($url, $params);
- break;
- case 'POST':
- return $this->httpPost($url, $params);
- break;
- }
+ switch($method)
+ {
+ case 'GET':
+ return $this->httpGet($url, $params);
+ break;
+ case 'POST':
+ return $this->httpPost($url, $params);
+ break;
+ }
}
public function setToken($token = null, $secret = null)
{
- $params = func_get_args();
- $this->token = $token;
- $this->tokenSecret = $secret;
+ $params = func_get_args();
+ $this->token = $token;
+ $this->tokenSecret = $secret;
}
public function encode($string)
{
- return rawurlencode(utf8_encode($string));
+ return rawurlencode(utf8_encode($string));
}
protected function addOAuthHeaders(&$ch, $url, $oauthHeaders)
{
- $_h = array('Expect:');
- $urlParts = parse_url($url);
- $oauth = 'Authorization: OAuth realm="' . $urlParts['path'] . '",';
- foreach($oauthHeaders as $name => $value)
- {
- $oauth .= "{$name}=\"{$value}\",";
- }
- $_h[] = substr($oauth, 0, -1);
+ $_h = array('Expect:');
+ $urlParts = parse_url($url);
+ $oauth = 'Authorization: OAuth realm="' . $urlParts['path'] . '",';
+ foreach($oauthHeaders as $name => $value)
+ {
+ $oauth .= "{$name}=\"{$value}\",";
+ }
+ $_h[] = substr($oauth, 0, -1);
- curl_setopt($ch, CURLOPT_HTTPHEADER, $_h);
+ curl_setopt($ch, CURLOPT_HTTPHEADER, $_h);
}
protected function generateNonce()
{
- if(isset($this->nonce)) // for unit testing
- return $this->nonce;
+ if(isset($this->nonce)) // for unit testing
+ return $this->nonce;
- return md5(uniqid(rand(), true));
+ return md5(uniqid(rand(), true));
}
protected function generateSignature($method = null, $url = null, $params =
null)
{
- if(empty($method) || empty($url))
- return false;
+ if(empty($method) || empty($url))
+ return false;
- // concatenating
- $concatenatedParams = '';
- foreach($params as $k => $v)
- {
- $v = $this->encode($v);
- $concatenatedParams .= "{$k}={$v}&";
- }
- $concatenatedParams = $this->encode(substr($concatenatedParams, 0, -1));
-
- // normalize url
- $normalizedUrl = $this->encode($this->normalizeUrl($url));
- $method = $this->encode($method); // don't need this but why not?
+ // concatenating
+ $concatenatedParams = '';
+ foreach($params as $k => $v)
+ {
+ $v = $this->encode($v);
+ $concatenatedParams .= "{$k}={$v}&";
+ }
+ $concatenatedParams = $this->encode(substr($concatenatedParams, 0, -1));
+
+ // normalize url
+ $normalizedUrl = $this->encode($this->normalizeUrl($url));
+ $method = $this->encode($method); // don't need this but why not?
- $signatureBaseString =
"{$method}&{$normalizedUrl}&{$concatenatedParams}";
- return $this->signString($signatureBaseString);
+ $signatureBaseString = "{$method}&{$normalizedUrl}&{$concatenatedParams}";
+ return $this->signString($signatureBaseString);
}
protected function httpGet($url, $params = null)
{
- if(count($params['request']) > 0)
- {
- $url .= '?';
- foreach($params['request'] as $k => $v)
- {
- $url .= "{$k}={$v}&";
- }
- $url = substr($url, 0, -1);
- }
- $ch = curl_init($url);
- $this->addOAuthHeaders($ch, $url, $params['oauth']);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
- $resp = $this->curl->addCurl($ch);
+ if(count($params['request']) > 0)
+ {
+ $url .= '?';
+ foreach($params['request'] as $k => $v)
+ {
+ $url .= "{$k}={$v}&";
+ }
+ $url = substr($url, 0, -1);
+ }
+ $ch = curl_init($url);
+ $this->addOAuthHeaders($ch, $url, $params['oauth']);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ $resp = $this->curl->addCurl($ch);
- return $resp;
+ return $resp;
}
protected function httpPost($url, $params = null)
{
- $ch = curl_init($url);
- $this->addOAuthHeaders($ch, $url, $params['oauth']);
- curl_setopt($ch, CURLOPT_POST, 1);
- curl_setopt($ch, CURLOPT_POSTFIELDS,
http_build_query($params['request']));
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
- $resp = $this->curl->addCurl($ch);
- return $resp;
+ $ch = curl_init($url);
+ $this->addOAuthHeaders($ch, $url, $params['oauth']);
+ curl_setopt($ch, CURLOPT_POST, 1);
+ curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($params['request']));
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ $resp = $this->curl->addCurl($ch);
+ return $resp;
}
protected function normalizeUrl($url = null)
{
- $urlParts = parse_url($url);
- $scheme = strtolower($urlParts['scheme']);
- $host = strtolower($urlParts['host']);
- $port = intval($urlParts['port']);
-
- $retval = "{$scheme}://{$host}";
- if($port > 0 && ($scheme === 'http' && $port !== 80) || ($scheme ===
'https' && $port !== 443))
- {
- $retval .= ":{$port}";
- }
- $retval .= $urlParts['path'];
- if(!empty($urlParts['query']))
- {
- $retval .= "?{$urlParts['query']}";
- }
+ $urlParts = parse_url($url);
+ $scheme = strtolower($urlParts['scheme']);
+ $host = strtolower($urlParts['host']);
+ $port = intval($urlParts['port']);
- return $retval;
+ $retval = "{$scheme}://{$host}";
+ if($port > 0 && ($scheme === 'http' && $port !== 80) || ($scheme === 'https'
&& $port !== 443))
+ {
+ $retval .= ":{$port}";
+ }
+ $retval .= $urlParts['path'];
+ if(!empty($urlParts['query']))
+ {
+ $retval .= "?{$urlParts['query']}";
+ }
+
+ return $retval;
}
protected function prepareParameters($method = null, $url = null, $params =
null)
{
- if(empty($method) || empty($url))
- return false;
+ if(empty($method) || empty($url))
+ return false;
- $oauth['oauth_consumer_key'] = $this->consumerKey;
- $oauth['oauth_token'] = $this->token;
- $oauth['oauth_nonce'] = $this->generateNonce();
- $oauth['oauth_timestamp'] = !isset($this->timestamp) ? time() :
$this->timestamp; // for unit test
- $oauth['oauth_signature_method'] = $this->signatureMethod;
- $oauth['oauth_version'] = $this->version;
-
- // encoding
- array_walk($oauth, array($this, 'encode'));
- if(is_array($params))
- array_walk($params, array($this, 'encode'));
- $encodedParams = array_merge($oauth, (array)$params);
-
- // sorting
- ksort($encodedParams);
-
- // signing
- $oauth['oauth_signature'] =
$this->encode($this->generateSignature($method, $url, $encodedParams));
- return array('request' => $params, 'oauth' => $oauth);
+ $oauth['oauth_consumer_key'] = $this->consumerKey;
+ $oauth['oauth_token'] = $this->token;
+ $oauth['oauth_nonce'] = $this->generateNonce();
+ $oauth['oauth_timestamp'] = !isset($this->timestamp) ? time() :
$this->timestamp; // for unit test
+ $oauth['oauth_signature_method'] = $this->signatureMethod;
+ $oauth['oauth_version'] = $this->version;
+
+ // encoding
+ array_walk($oauth, array($this, 'encode'));
+ if(is_array($params))
+ array_walk($params, array($this, 'encode'));
+ $encodedParams = array_merge($oauth, (array)$params);
+
+ // sorting
+ ksort($encodedParams);
+
+ // signing
+ $oauth['oauth_signature'] = $this->encode($this->generateSignature($method,
$url, $encodedParams));
+ return array('request' => $params, 'oauth' => $oauth);
}
protected function signString($string = null)
{
- $retval = false;
- switch($this->signatureMethod)
- {
- case 'HMAC-SHA1':
- $key = $this->encode($this->consumerSecret) . '&' .
$this->encode($this->tokenSecret);
- $retval = base64_encode(hash_hmac('sha1', $string, $key, true));
- break;
- }
+ $retval = false;
+ switch($this->signatureMethod)
+ {
+ case 'HMAC-SHA1':
+ $key = $this->encode($this->consumerSecret) . '&' .
$this->encode($this->tokenSecret);
+ $retval = base64_encode(hash_hmac('sha1', $string, $key, true));
+ break;
+ }
- return $retval;
+ return $retval;
}
public function __construct($consumerKey, $consumerSecret,
$signatureMethod='HMAC-SHA1')
{
- $this->consumerKey = $consumerKey;
- $this->consumerSecret = $consumerSecret;
- $this->signatureMethod = $signatureMethod;
- $this->curl = EpiCurl::getInstance();
+ $this->consumerKey = $consumerKey;
+ $this->consumerSecret = $consumerSecret;
+ $this->signatureMethod = $signatureMethod;
+ $this->curl = EpiCurl::getInstance();
}
}
@@ -214,21 +214,21 @@ class EpiOAuthResponse
public function __construct($resp)
{
- $this->__resp = $resp;
+ $this->__resp = $resp;
}
public function __get($name)
{
- if($this->__resp->code < 200 || $this->__resp->code > 299)
- return false;
+ if($this->__resp->code < 200 || $this->__resp->code > 299)
+ return false;
- parse_str($this->__resp->data, $result);
- foreach($result as $k => $v)
- {
- $this->$k = $v;
- }
+ parse_str($this->__resp->data, $result);
+ foreach($result as $k => $v)
+ {
+ $this->$k = $v;
+ }
- return $result[$name];
+ return $result[$name];
}
}
?>
\ No newline at end of file
Modified:
ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiTwitter.php
URL:
http://svn.apache.org/viewvc/ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiTwitter.php?rev=1806551&r1=1806550&r2=1806551&view=diff
==============================================================================
--- ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiTwitter.php
(original)
+++ ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiTwitter.php Tue
Aug 29 10:19:35 2017
@@ -9,20 +9,20 @@ class EpiTwitter extends EpiOAuth
public function __call($name, $params = null)
{
- $parts = explode('_', $name);
- $method = strtoupper(array_shift($parts));
- $parts = implode('_', $parts);
- $url = $this->apiUrl . '/' . preg_replace('/[A-Z]|[0-9]+/e',
"'/'.strtolower('\\0')", $parts) . '.json';
- if(!empty($params))
- $args = array_shift($params);
+ $parts = explode('_', $name);
+ $method = strtoupper(array_shift($parts));
+ $parts = implode('_', $parts);
+ $url = $this->apiUrl . '/' . preg_replace('/[A-Z]|[0-9]+/e',
"'/'.strtolower('\\0')", $parts) . '.json';
+ if(!empty($params))
+ $args = array_shift($params);
- return new EpiTwitterJson(call_user_func(array($this, 'httpRequest'),
$method, $url, $args));
+ return new EpiTwitterJson(call_user_func(array($this, 'httpRequest'),
$method, $url, $args));
}
public function __construct($consumerKey = null, $consumerSecret = null,
$oauthToken = null, $oauthTokenSecret = null)
{
- parent::__construct($consumerKey, $consumerSecret,
self::EPITWITTER_SIGNATURE_METHOD);
- $this->setToken($oauthToken, $oauthTokenSecret);
+ parent::__construct($consumerKey, $consumerSecret,
self::EPITWITTER_SIGNATURE_METHOD);
+ $this->setToken($oauthToken, $oauthTokenSecret);
}
}
@@ -32,18 +32,18 @@ class EpiTwitterJson
public function __construct($resp)
{
- $this->resp = $resp;
+ $this->resp = $resp;
}
public function __get($name)
{
- $this->responseText = $this->resp->data;
- $this->response = (array)json_decode($this->responseText, 1);
- foreach($this->response as $k => $v)
- {
- $this->$k = $v;
- }
+ $this->responseText = $this->resp->data;
+ $this->response = (array)json_decode($this->responseText, 1);
+ foreach($this->response as $k => $v)
+ {
+ $this->$k = $v;
+ }
- return $this->$name;
+ return $this->$name;
}
}
Modified: ofbiz/site/template/page/about-ofbiz.tpl.php
URL:
http://svn.apache.org/viewvc/ofbiz/site/template/page/about-ofbiz.tpl.php?rev=1806551&r1=1806550&r2=1806551&view=diff
==============================================================================
--- ofbiz/site/template/page/about-ofbiz.tpl.php (original)
+++ ofbiz/site/template/page/about-ofbiz.tpl.php Tue Aug 29 10:19:35 2017
@@ -23,18 +23,18 @@
<p> We have a three different community mailing lists. See below
for details. </p>
<h3>Community Help and Support</h3>
<p>Our Community is keen to share information and support other
OFBiz users in their implementations. Please dont hesitate to view or
participate in our mailing list discussions.</p>
- <p>To subscribe to a mailing list please use the links below. In
your first email you will recieve instructions about how to use the mailing
list manager program (EZMLM)</p>
- <p>To unsubscribe from any of the following lists, send an empty,
subjectless email to unsubscribe address listed below. In other words, click
the appropriate unsubscribe link below and press send. </p>
+ <p>To subscribe to a mailing list please use the links below. In your
first email you will recieve instructions about how to use the mailing list
manager program (EZMLM)</p>
+ <p>To unsubscribe from any of the following lists, send an empty,
subjectless email to unsubscribe address listed below. In other words, click
the appropriate unsubscribe link below and press send. </p>
</div>
</section>
<section class="span12 mb15">
<div class="row-fluid">
<div class="span4">
<h3 class="mediumIconH3"><span class="iconWrapper
iconMedium"><i class="icon-resize-full-alt" ></i></span> User Mailing List</h3>
-
+
<p>The user list is intended for help or issues with OFBiz
installation, deployment, custom development and usage related topics.</p>
- <p> Please remember if you are reporting an issue to include the
following:</p>
- <ol class="iconsList">
+ <p> Please remember if you are reporting an issue to include the
following:</p>
+ <ol class="iconsList">
<li><span class="iconWrapper iconMini">1</span> What you were
looking for?</li>
<li><span class="iconWrapper iconMini">2</span> How did you try
to achieve it?</li>
<li><span class="iconWrapper iconMini">3</span> What did you
expect as results?</li>
@@ -42,16 +42,16 @@
</ol>
<a class="btn btnSmall"
href="http://ofbiz.135035.n4.nabble.com/OFBiz-User-f135036.html";>User List</a>
</div>
- <div class="span4">
+ <div class="span4">
<h3 class="mediumIconH3"><span class="iconWrapper
iconMedium"><i class="icon-twitter"></i></span> Developer Mailing List</h3>
<p>The developer list is strictly for topics related to the
design and development of the OFBiz Project itself.</p>
- <p>Please don't ask questions relevant to User Mailing List in
this Mailing List.</p>
- <p>If you are not sure to which list to post to then use the
User Mailing List..</p>
+ <p>Please don't ask questions relevant to User Mailing List in this
Mailing List.</p>
+ <p>If you are not sure to which list to post to then use the User Mailing
List..</p>
<a class="btn btnSmall"
href="http://ofbiz.135035.n4.nabble.com/OFBiz-Dev-f165671.html";>Developer
List</a> </div>
<div class="span4">
<h3 class="mediumIconH3"><span class="iconWrapper
iconMedium"><i class="icon-star"></i></span> Commit Mailing List</h3>
<p>The commits list is used to notify subscribers of commits
to the OFBiz SVN repository.</p>
- <p> It is not used for discussions only for reference.</p>
+ <p> It is not used for discussions only for reference.</p>
<a class="btn btnSmall" href="#">Commits List</a> </div>
</div>
</section>
Modified: ofbiz/site/template/page/business-users.tpl.php
URL:
http://svn.apache.org/viewvc/ofbiz/site/template/page/business-users.tpl.php?rev=1806551&r1=1806550&r2=1806551&view=diff
==============================================================================
--- ofbiz/site/template/page/business-users.tpl.php (original)
+++ ofbiz/site/template/page/business-users.tpl.php Tue Aug 29 10:19:35 2017
@@ -21,150 +21,150 @@
<li> <a href="#UsrStart"> Where to Start? </a> </li>
<li> <a href="#UsrDemo"> Online Demos </a> </li>
<li> <a href="#UsrModules"> Modules and Features </a> </li>
- <li> <a href="#UsrInstall"> Download and Install </a> </li>
- <li> <a href="#UsrDocs"> Documentation and Help </a> </li>
- </ul>
+ <li> <a href="#UsrInstall"> Download and Install </a> </li>
+ <li> <a href="#UsrDocs"> Documentation and Help </a> </li>
+ </ul>
</aside>
<div class="span10">
<section id="UsrStart" class="slice row clearfix">
<div class="span10">
<h2>Where to Start?</h2>
<div class="divider"><span></span></div>
- <p>Getting started with OFBiz is easy and you also have the
choice about where you want to start. We have a range of information about
OFBiz modules and features as well as an online demo that you can try. After
taking a look you want to download and install OFBiz too, then you'll find
details about how to do this later in this page.</p>
- <ul class="iconsList">
+ <p>Getting started with OFBiz is easy and you also have the choice about
where you want to start. We have a range of information about OFBiz modules and
features as well as an online demo that you can try. After taking a look you
want to download and install OFBiz too, then you'll find details about how to
do this later in this page.</p>
+ <ul class="iconsList">
<li><i class="icon-pin"></i> To see what OFBiz looks like
and how it works, please try our <a href="ofbiz-demos.html"><strong>Online
Demos</strong></a></li>
- <li><i class="icon-pin"></i> To get details about what
modules and features Apache OFBiz has, please take a look at <a
href="#UsrModules"><strong>Modules and Features</strong></a> </li>
- <li><i class="icon-pin"></i> To download your own version of
Apache OFBiz, please take a look at <a href="#UsrInstall"><strong>Download and
Install OFBiz</strong></a> </li>
- </ul>
+ <li><i class="icon-pin"></i> To get details about what modules and
features Apache OFBiz has, please take a look at <a
href="#UsrModules"><strong>Modules and Features</strong></a> </li>
+ <li><i class="icon-pin"></i> To download your own version of Apache
OFBiz, please take a look at <a href="#UsrInstall"><strong>Download and Install
OFBiz</strong></a> </li>
+ </ul>
<p>If you are still unsure or have any questions then please
feel free to use our <a
href="https://lists.apache.org/[email protected]";
target="_blank"><strong>User Mailing List</strong></a> </p>
- </div>
+ </div>
</section>
- <section id="UsrDemo" class="slice row clearfix">
+ <section id="UsrDemo" class="slice row clearfix">
<div class="span10">
<h2>Online Demos</h2>
<div class="divider"><span></span></div>
<p>If you would like try out OFBiz, then we have a range of
demos that you can login to to see what OFBiz looks like and also to test out
any of the modules. Our demos include <strong> demo data </strong> that will
help you understand how to use specific modules.</p>
- <p>We have two demos,
- <ul class="iconsList">
+ <p>We have two demos,
+ <ul class="iconsList">
<li><i class="icon-pin"></i> one demo for the backend ERP
applications and;</li>
- <li><i class="icon-pin"></i> one demo for the e-commerce
store </li>
- </ul>
+ <li><i class="icon-pin"></i> one demo for the e-commerce store </li>
+ </ul>
<p>Please take a look at <a href="ofbiz-demos.html"><strong>Online
Demos</strong> </a> page for details about how to login and access the
system.</p>
- </div>
+ </div>
</section>
- <section id="UsrModules" class="slice row clearfix">
+ <section id="UsrModules" class="slice row clearfix">
<div class="span10">
<h2>Modules and Features</h2>
- <div class="divider"><span></span></div>
- <div class="tabbable tabs-left">
+ <div class="divider"><span></span></div>
+ <div class="tabbable tabs-left">
<ul class="nav nav-tabs " id="modulesTabV">
<li class="active"> <a href="#tabs-v-1"
data-toggle="tab"> Accounting </a> </li>
<li> <a href="#tabs-v-3" data-toggle="tab">
Manufacturing </a> </li>
- <li> <a href="#tabs-v-4" data-toggle="tab"> Human
Resources </a> </li>
- <li> <a href="#tabs-v-5" data-toggle="tab"> Inventory
Management </a> </li>
+ <li> <a href="#tabs-v-4" data-toggle="tab"> Human Resources </a>
</li>
+ <li> <a href="#tabs-v-5" data-toggle="tab"> Inventory Management
</a> </li>
<li> <a href="#tabs-v-7" data-toggle="tab"> Catalog
Management </a> </li>
<li> <a href="#tabs-v-9" data-toggle="tab"> CRM & Order
Management </a> </li>
- <li> <a href="#tabs-v-10" data-toggle="tab"> e-Commerce /
e-Shop </a> </li>
+ <li> <a href="#tabs-v-10" data-toggle="tab"> e-Commerce /
e-Shop </a> </li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tabs-v-1">
- <ul class="iconsList">
- <li><i class="icon-pin"></i> Standard Double entry
General Ledger </li>
- <li><i class="icon-pin"></i> Supports multiple
organisations, account hierarchies and segmentation</li>
- <li><i class="icon-pin"></i> Accounts Receivable (AR),
Accounts Payable (AP), Invoices, Payments, Statements and Aging </li>
- <li><i class="icon-pin"></i> Agreement contracts and
Credit management</li>
- <li><i class="icon-pin"></i> Asset Management
including Depreciation</li>
- <li><i class="icon-pin"></i> Budgeting Management</li>
- <li><i class="icon-pin"></i> Support for payment
gateways and payment processing</li>
- <li><i class="icon-pin"></i> Financial Reporting </li>
- <li><i class="icon-pin"></i> Fully integrated with
Order Management, Inventory, Purchasing and Manufacturing out of the box</li>
- </ul>
+ <ul class="iconsList">
+ <li><i class="icon-pin"></i> Standard Double entry
General Ledger </li>
+ <li><i class="icon-pin"></i> Supports multiple organisations,
account hierarchies and segmentation</li>
+ <li><i class="icon-pin"></i> Accounts Receivable (AR), Accounts
Payable (AP), Invoices, Payments, Statements and Aging </li>
+ <li><i class="icon-pin"></i> Agreement contracts and Credit
management</li>
+ <li><i class="icon-pin"></i> Asset Management including
Depreciation</li>
+ <li><i class="icon-pin"></i> Budgeting Management</li>
+ <li><i class="icon-pin"></i> Support for payment gateways and payment
processing</li>
+ <li><i class="icon-pin"></i> Financial Reporting </li>
+ <li><i class="icon-pin"></i> Fully integrated with Order
Management, Inventory, Purchasing and Manufacturing out of the box</li>
+ </ul>
</div>
<div class="tab-pane" id="tabs-v-3">
- <ul class="iconsList">
- <li><i class="icon-pin"></i> Bill of Materials </li>
- <li><i class="icon-pin"></i> Jobshop, Manufacturing
Routings and Tasks</li>
- <li><i class="icon-pin"></i> Production Planning and
MRP </li>
- <li><i class="icon-pin"></i> Production and Job
Costing</li>
- <li><i class="icon-pin"></i> Equipment Billing</li>
- <li><i class="icon-pin"></i> Raw Material
Procurement</li>
- <li><i class="icon-pin"></i> Manufacturing
Reporting</li>
- </ul>
+ <ul class="iconsList">
+ <li><i class="icon-pin"></i> Bill of Materials </li>
+ <li><i class="icon-pin"></i> Jobshop, Manufacturing Routings and
Tasks</li>
+ <li><i class="icon-pin"></i> Production Planning and MRP </li>
+ <li><i class="icon-pin"></i> Production and Job Costing</li>
+ <li><i class="icon-pin"></i> Equipment Billing</li>
+ <li><i class="icon-pin"></i> Raw Material Procurement</li>
+ <li><i class="icon-pin"></i> Manufacturing Reporting</li>
+ </ul>
</div>
- <div class="tab-pane" id="tabs-v-4">
- <ul class="iconsList">
- <li><i class="icon-pin"></i> Company and Department
Structure </li>
- <li><i class="icon-pin"></i> Manage Job Positions,
Skills and Performance Reviews</li>
- <li><i class="icon-pin"></i> Manage Recruitment
Process, Applications, Interviews </li>
- <li><i class="icon-pin"></i> Salaries and Payments</li>
- <li><i class="icon-pin"></i> Employment Contracts</li>
- <li><i class="icon-pin"></i> Employee Expenses</li>
- <li><i class="icon-pin"></i> Training</li>
- </ul>
+ <div class="tab-pane" id="tabs-v-4">
+ <ul class="iconsList">
+ <li><i class="icon-pin"></i> Company and Department
Structure </li>
+ <li><i class="icon-pin"></i> Manage Job Positions, Skills and
Performance Reviews</li>
+ <li><i class="icon-pin"></i> Manage Recruitment Process,
Applications, Interviews </li>
+ <li><i class="icon-pin"></i> Salaries and Payments</li>
+ <li><i class="icon-pin"></i> Employment Contracts</li>
+ <li><i class="icon-pin"></i> Employee Expenses</li>
+ <li><i class="icon-pin"></i> Training</li>
+ </ul>
</div>
- <div class="tab-pane" id="tabs-v-5">
+ <div class="tab-pane" id="tabs-v-5">
- <ul class="iconsList">
- <li><i class="icon-pin"></i> Manage and setup single,
multiple warehouses </li>
- <li><i class="icon-pin"></i> Inventory Locations </li>
- <li><i class="icon-pin"></i> Serialized on non
serialized Inventory </li>
- <li><i class="icon-pin"></i> Lot Management</li>
- <li><i class="icon-pin"></i> Shipment Integration</li>
- <li><i class="icon-pin"></i> Picklist and Package
Management</li>
- <li><i class="icon-pin"></i> Receiving </li>
- <li><i class="icon-pin"></i> Returns </li>
- </ul>
+ <ul class="iconsList">
+ <li><i class="icon-pin"></i> Manage and setup single,
multiple warehouses </li>
+ <li><i class="icon-pin"></i> Inventory Locations </li>
+ <li><i class="icon-pin"></i> Serialized on non serialized Inventory
</li>
+ <li><i class="icon-pin"></i> Lot Management</li>
+ <li><i class="icon-pin"></i> Shipment Integration</li>
+ <li><i class="icon-pin"></i> Picklist and Package Management</li>
+ <li><i class="icon-pin"></i> Receiving </li>
+ <li><i class="icon-pin"></i> Returns </li>
+ </ul>
</div>
- <div class="tab-pane" id="tabs-v-7">
- <ul class="iconsList">
- <li><i class="icon-pin"></i> Support unlimited stores,
catalogs, categories, and products</li>
- <li><i class="icon-pin"></i> Handles a range of
products (physical, digital, downloadable products, variant, configurable)</li>
- <li><i class="icon-pin"></i> Gift Certificates and
gift cards</li>
- <li><i class="icon-pin"></i> Price rules for customer
or group-specific pricing </li>
- <li><i class="icon-pin"></i> Online store promotion
engine</li>
- <li><i class="icon-pin"></i> Integration with major
payment gateway providers</li>
- <li><i class="icon-pin"></i> Fully integrated online
and Point of Sales (POS) stores out-of-the-box</li>
- <li><i class="icon-pin"></i> Keyword search capability
in all the applications using hibernate search</li>
- </ul>
+ <div class="tab-pane" id="tabs-v-7">
+ <ul class="iconsList">
+ <li><i class="icon-pin"></i> Support unlimited stores,
catalogs, categories, and products</li>
+ <li><i class="icon-pin"></i> Handles a range of products (physical,
digital, downloadable products, variant, configurable)</li>
+ <li><i class="icon-pin"></i> Gift Certificates and gift cards</li>
+ <li><i class="icon-pin"></i> Price rules for customer or
group-specific pricing </li>
+ <li><i class="icon-pin"></i> Online store promotion engine</li>
+ <li><i class="icon-pin"></i> Integration with major payment gateway
providers</li>
+ <li><i class="icon-pin"></i> Fully integrated online and Point of Sales
(POS) stores out-of-the-box</li>
+ <li><i class="icon-pin"></i> Keyword search capability in all the
applications using hibernate search</li>
+ </ul>
</div>
-
- <div class="tab-pane" id="tabs-v-9">
+
+ <div class="tab-pane" id="tabs-v-9">
<ul class="iconsList">
- <li><i class="icon-pin"></i> Lead and Sales
Opportunity Management </li>
- <li><i class="icon-pin"></i> Sales ForecastsManage
sales opportunities</li>
- <li><i class="icon-pin"></i> Shared Sales Team
Documents, Calendar and Tasks </li>
- <li><i class="icon-pin"></i> Email Integration</li>
- <li><i class="icon-pin"></i> Customer Service and Case
Managment</li>
- <li><i class="icon-pin"></i> Quotes, Order Entry and
Order Management</li>
- <li><i class="icon-pin"></i> Manage marketing campaign
including tracking code reporting</li>
- </ul>
+ <li><i class="icon-pin"></i> Lead and Sales Opportunity
Management </li>
+ <li><i class="icon-pin"></i> Sales ForecastsManage sales
opportunities</li>
+ <li><i class="icon-pin"></i> Shared Sales Team Documents, Calendar
and Tasks </li>
+ <li><i class="icon-pin"></i> Email Integration</li>
+ <li><i class="icon-pin"></i> Customer Service and Case Managment</li>
+ <li><i class="icon-pin"></i> Quotes, Order Entry and Order
Management</li>
+ <li><i class="icon-pin"></i> Manage marketing campaign including
tracking code reporting</li>
+ </ul>
</div>
- <div class="tab-pane" id="tabs-v-10">
+ <div class="tab-pane" id="tabs-v-10">
<ul class="iconsList">
- <li><i class="icon-pin"></i> Unlimited stores,
catalogs, categories and products </li>
- <li><i class="icon-pin"></i> Cross-sell and upsell
products</li>
- <li><i class="icon-pin"></i> Supports physical,
digital, downloadable, variant and configurable products </li>
- <li><i class="icon-pin"></i> Gift Certificates and
Gift Cards</li>
- <li><i class="icon-pin"></i> Pricing rules and
Discounts</li>
- <li><i class="icon-pin"></i> Online store promotion
engine</li>
- <li><i class="icon-pin"></i> Integrations with payment
gateways</li>
- <li><i class="icon-pin"></i> Product searching </li>
- <li><i class="icon-pin"></i> Customer portal </li>
- </ul>
+ <li><i class="icon-pin"></i> Unlimited stores, catalogs,
categories and products </li>
+ <li><i class="icon-pin"></i> Cross-sell and upsell products</li>
+ <li><i class="icon-pin"></i> Supports physical, digital,
downloadable, variant and configurable products </li>
+ <li><i class="icon-pin"></i> Gift Certificates and Gift Cards</li>
+ <li><i class="icon-pin"></i> Pricing rules and Discounts</li>
+ <li><i class="icon-pin"></i> Online store promotion engine</li>
+ <li><i class="icon-pin"></i> Integrations with payment gateways</li>
+ <li><i class="icon-pin"></i> Product searching </li>
+ <li><i class="icon-pin"></i> Customer portal </li>
+ </ul>
</div>
</div>
@@ -174,47 +174,47 @@
- <section id="UsrInstall" class="slice row clearfix">
+ <section id="UsrInstall" class="slice row clearfix">
<div class="span10">
<h2>Download and Install</h2>
<div class="divider"><span></span></div>
- <h3>Downloading OFBiz</h3>
- <p>You can download Apache OFBiz from one of our <a
href="download.html">download mirrors</a>. Once downloaded, extract the file to
create the OFBiz directory. </p>
- <p><strong>NOTE</strong>: Please make sure that you use our
latest stable release as this version has been verified by the project as
suitable for our users.</p>
- <h3>Build and Running OFBiz</h3>
+ <h3>Downloading OFBiz</h3>
+ <p>You can download Apache OFBiz from one of our <a
href="download.html">download mirrors</a>. Once downloaded, extract the file to
create the OFBiz directory. </p>
+ <p><strong>NOTE</strong>: Please make sure that you use our latest stable
release as this version has been verified by the project as suitable for our
users.</p>
+ <h3>Build and Running OFBiz</h3>
<div class="divider"><span></span></div>
- <p>Once you have downloaded OFBiz it needs to be built
before you can run it. To build OFBiz and start it running, you will need
to:</p>
- <ul class="iconsList">
- <li><i class="icon-pin"></i>open a command line window
and;</li>
- <li><i class="icon-pin"></i> navigate to the OFBiz
directory then:</li>
- </ul>
- <p>Run the following command for Unix-like OS</p>
- <code>./gradlew ofbiz loadDefault</code>
- <p></p>
- <p>Run the following command for Windows</p>
- <code>gradlew ofbiz loadDefault</code>
- <p></p>
- <p><strong>NOTE</strong>: It is completely normal for the
command line window to remain active while OFBiz is running (e.g at 91%).</p>
- <p>To log into OFBiz, navigate with your browser to </p>
- <p><code>https://localhost:8443/accounting</code></p>
- <p>and login with username <strong>"admin" </strong>and
password <strong>"ofbiz"</strong></p>
- <p><strong>NOTE:</strong> These commands will build OFBiz and
include demo data. For further details of how to build OFBiz without any demo
data and a full list of all available commands, please take a look at the
readme.md file</p>
- </div>
+ <p>Once you have downloaded OFBiz it needs to be built before
you can run it. To build OFBiz and start it running, you will need to:</p>
+ <ul class="iconsList">
+ <li><i class="icon-pin"></i>open a command line window and;</li>
+ <li><i class="icon-pin"></i> navigate to the OFBiz directory then:</li>
+ </ul>
+ <p>Run the following command for Unix-like OS</p>
+ <code>./gradlew ofbiz loadDefault</code>
+ <p></p>
+ <p>Run the following command for Windows</p>
+ <code>gradlew ofbiz loadDefault</code>
+ <p></p>
+ <p><strong>NOTE</strong>: It is completely normal for the command line
window to remain active while OFBiz is running (e.g at 91%).</p>
+ <p>To log into OFBiz, navigate with your browser to </p>
+ <p><code>https://localhost:8443/accounting</code></p>
+ <p>and login with username <strong>"admin" </strong>and password
<strong>"ofbiz"</strong></p>
+ <p><strong>NOTE:</strong> These commands will build OFBiz and include demo
data. For further details of how to build OFBiz without any demo data and a
full list of all available commands, please take a look at the readme.md
file</p>
+ </div>
</section>
- <section id="UsrDocs" class="slice row clearfix">
+ <section id="UsrDocs" class="slice row clearfix">
<div class="span10">
<h2>Documentation and Help</h2>
<div class="divider"><span></span></div>
- <p><a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Documentation#Documentation-End-UserDocumentation";
target="external"><strong>User Documentation</strong></a></p>
+ <p><a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Documentation#Documentation-End-UserDocumentation";
target="external"><strong>User Documentation</strong></a></p>
<p><a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Home";
target="external"><strong>OFBiz Wiki</strong></a></p>
- <p><a href="faqs.html" target="_blank"><strong>OFBiz Frequently
Asksed Questions (FAQs)</strong></a></p>
-
+ <p><a href="faqs.html" target="_blank"><strong>OFBiz Frequently Asksed
Questions (FAQs)</strong></a></p>
+
</div>
</section>
-
+
</div>
</div>
</div>
Modified: ofbiz/site/template/page/developers.tpl.php
URL:
http://svn.apache.org/viewvc/ofbiz/site/template/page/developers.tpl.php?rev=1806551&r1=1806550&r2=1806551&view=diff
==============================================================================
--- ofbiz/site/template/page/developers.tpl.php (original)
+++ ofbiz/site/template/page/developers.tpl.php Tue Aug 29 10:19:35 2017
@@ -21,10 +21,10 @@
<li> <a href="#DevPreq"> Pre-Requisites </a> </li>
<li> <a href="#DevDownld"> Download </a> </li>
<li> <a href="#DevBldRun"> Build and Run </a> </li>
- <li> <a href="#DevRepo"> Browse Repository </a> </li>
- <li> <a href="#DevTutorial"> Tutorial </a> </li>
- <li> <a href="#DevDocs"> Documentation and Help </a> </li>
- <li> <a href="#DevDemo"> Demo </a> </li>
+ <li> <a href="#DevRepo"> Browse Repository </a> </li>
+ <li> <a href="#DevTutorial"> Tutorial </a> </li>
+ <li> <a href="#DevDocs"> Documentation and Help </a> </li>
+ <li> <a href="#DevDemo"> Demo </a> </li>
</ul>
</aside>
<div class="span10">
@@ -32,71 +32,71 @@
<div class="span10">
<h2>Pre-Requisites</h2>
<div class="divider"><span></span></div>
- <ul class="iconsList">
- <li><i class="icon-pin"></i> For 16.11, the ofbiz-framework
trunk and ofbiz-plugins trunk the minimum requirement you need installed is
Java 1.8 SDK.</li>
- <li><i class="icon-pin"></i> Apache OFBiz can be downloaded
and run on both Unix based and Windows based systems</li>
- </ul>
- <p><strong>NOTE:</strong> If you are running an older release
or branch then please refer to <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Home"; target="_blank"
>our Wiki</a> for details</p>
+ <ul class="iconsList">
+ <li><i class="icon-pin"></i> For 16.11, the ofbiz-framework trunk and
ofbiz-plugins trunk the minimum requirement you need installed is Java 1.8
SDK.</li>
+ <li><i class="icon-pin"></i> Apache OFBiz can be downloaded and run on
both Unix based and Windows based systems</li>
+ </ul>
+ <p><strong>NOTE:</strong> If you are running an older release
or branch then please refer to <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Home"; target="_blank"
>our Wiki</a> for details</p>
</div>
</section>
- <section id="DevDownld" class="slice row clearfix">
+ <section id="DevDownld" class="slice row clearfix">
<div class="span10">
<h2>Download</h2>
<div class="divider"><span></span></div>
<p>There are two ways to download the OFBiz source code</p>
- <h3>1. Using a Download Mirror</h3>
- <p>Download your required version from one of our <a
href="download.html">download mirrors</a> and extract the zip file </p>
- <h3>2. Checkout the Source Code</h3>
- <p>Checkout the source code from the repository</p>
- <p>Anyone can checkout or <a href="#DevRepo">browse the source
code </a>in the OFBiz public Subversion (SVN) repository.</p>
- <p>To checkout the source code, simply use the following
command (if you are using a GUI client, configure it appropriately).</p>
- <ul class="iconsList">
+ <h3>1. Using a Download Mirror</h3>
+ <p>Download your required version from one of our <a
href="download.html">download mirrors</a> and extract the zip file </p>
+ <h3>2. Checkout the Source Code</h3>
+ <p>Checkout the source code from the repository</p>
+ <p>Anyone can checkout or <a href="#DevRepo">browse the source code </a>in
the OFBiz public Subversion (SVN) repository.</p>
+ <p>To checkout the source code, simply use the following command (if you
are using a GUI client, configure it appropriately).</p>
+ <ul class="iconsList">
<li><i class="icon-pin"></i> <strong>ofbiz-framework
trunk</strong> : <code>$ svn co
http://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
ofbiz-framework</code></li>
- <li><i class="icon-pin"></i> <strong>ofbiz-plugins
trunk</strong> : <code>$ svn co
http://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk
ofbiz-plugins</code></li>
- <li><i class="icon-pin"></i> <strong>branch release16.11
(stable)</strong>: <code>$ svn co
http://svn.apache.org/repos/asf/ofbiz/branches/release16.11
ofbiz.16.11</code></li>
+ <li><i class="icon-pin"></i> <strong>ofbiz-plugins trunk</strong> :
<code>$ svn co http://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk
ofbiz-plugins</code></li>
+ <li><i class="icon-pin"></i> <strong>branch release16.11
(stable)</strong>: <code>$ svn co
http://svn.apache.org/repos/asf/ofbiz/branches/release16.11
ofbiz.16.11</code></li>
</ul>
- </div>
+ </div>
</section>
- <section id="DevBldRun" class="slice row clearfix">
+ <section id="DevBldRun" class="slice row clearfix">
<div class="span10">
<h2>Build and Run</h2>
<div class="divider"><span></span></div>
<p>Once you have downloaded the source code it will need to be
built. The command to built.</p>
- <h3>Building Release 16.11</h3>
- <p>Release 16.11 and our ofbiz-framework trunk uses Gradle as
it's build system so the commands to build and run it are different to the
previous releases. </p>
- <p>To build 16.11 release,navigate to the OFBiz or
framework-trunk directory and;</p>
- <p>Run the following command for Unix-like OS</p>
- <code>./gradlew cleanAll loadDefault</code><p></p>
- <p>Run the following command for MS Windows</p>
- <code>gradlew cleanAll loadDefault</code>
- <p></p>
- <h3>Building the Trunk</h3>
- <p>After the 16.11 release a minor change has been made to the
Gradle build command for building OFBiz.</p>
- <p>To build the trunk, navigate to the framework-trunk
directory and;</p>
- <p>Run the following command for Unix-like OS</p>
- <code>./gradlew cleanAll loadAll</code><p></p>
- <p>Run the following command for MS Windows</p>
- <code>gradlew cleanAll loadAll</code>
- <p></p>
- <h3>Starting and Running 16.11 or the ofbiz-framework trunk</h3>
- <p>To start OFBiz running locally, navigate to the trunk
directory and;</p>
- <p>Run the following command for Unix-like OS</p>
- <code>./gradlew ofbiz</code><p></p>
- <p>Run the following command for MS Windows</p>
- <code>gradlew ofbiz</code>
- <p></p>
- <p>To log into OFBiz, navigate with your browser to </p>
- <p><code>https://localhost:8443/accounting</code></p>
- <p>and login with username <strong>"admin" </strong>and
password <strong>"ofbiz"</strong></p>
- <h3>Stopping OFBiz</h3>
- <p>To stop OFBiz running locally, open a command line terminal
window and navigate to the OFBiz directory and;</p>
- <p>Run the following command for Unix-like OS</p>
- <code>./gradlew 'ofbiz --shutdown'</code><p></p>
- <p>Run the following command for MS Windows</p>
- <code>gradlew ofbiz --shutdown</code>
- <p></p>
- <p><strong>NOTE</strong>: That quotes are needed for the Unix
based command. For further details and a full list of all available OFBiz
Gradle commands, please take a look at the readme.md file</p>
- <p></p>
+ <h3>Building Release 16.11</h3>
+ <p>Release 16.11 and our ofbiz-framework trunk uses Gradle as it's build
system so the commands to build and run it are different to the previous
releases. </p>
+ <p>To build 16.11 release,navigate to the OFBiz or framework-trunk
directory and;</p>
+ <p>Run the following command for Unix-like OS</p>
+ <code>./gradlew cleanAll loadDefault</code><p></p>
+ <p>Run the following command for MS Windows</p>
+ <code>gradlew cleanAll loadDefault</code>
+ <p></p>
+ <h3>Building the Trunk</h3>
+ <p>After the 16.11 release a minor change has been made to the Gradle
build command for building OFBiz.</p>
+ <p>To build the trunk, navigate to the framework-trunk directory and;</p>
+ <p>Run the following command for Unix-like OS</p>
+ <code>./gradlew cleanAll loadAll</code><p></p>
+ <p>Run the following command for MS Windows</p>
+ <code>gradlew cleanAll loadAll</code>
+ <p></p>
+ <h3>Starting and Running 16.11 or the ofbiz-framework trunk</h3>
+ <p>To start OFBiz running locally, navigate to the trunk directory and;</p>
+ <p>Run the following command for Unix-like OS</p>
+ <code>./gradlew ofbiz</code><p></p>
+ <p>Run the following command for MS Windows</p>
+ <code>gradlew ofbiz</code>
+ <p></p>
+ <p>To log into OFBiz, navigate with your browser to </p>
+ <p><code>https://localhost:8443/accounting</code></p>
+ <p>and login with username <strong>"admin" </strong>and password
<strong>"ofbiz"</strong></p>
+ <h3>Stopping OFBiz</h3>
+ <p>To stop OFBiz running locally, open a command line terminal window and
navigate to the OFBiz directory and;</p>
+ <p>Run the following command for Unix-like OS</p>
+ <code>./gradlew 'ofbiz --shutdown'</code><p></p>
+ <p>Run the following command for MS Windows</p>
+ <code>gradlew ofbiz --shutdown</code>
+ <p></p>
+ <p><strong>NOTE</strong>: That quotes are needed for the Unix based
command. For further details and a full list of all available OFBiz Gradle
commands, please take a look at the readme.md file</p>
+ <p></p>
</div>
</section>
<section id="DevRepo" class="slice row clearfix">
@@ -106,41 +106,41 @@
<p>You can browse the repository using any of the following
links.</p>
<ul class="iconsList">
<li><i class="icon-pin"></i> <a
href="http://svn.apache.org/repos/asf/ofbiz/"; target="_blank"><strong>SVN -
WebDAV</strong></a></li>
- <li><i class="icon-pin"></i> <a
href="http://svn.apache.org/viewvc/ofbiz/"; target="_blank"><strong>SVN -
ViewVC</strong></a></li>
- </ul>
- <p></p>
- <p>Our ofbiz-framework trunk and ofbiz-plugins trunk are also
available on Git at the links below:</p>
- <ul class="iconsList">
- <li><i class="icon-pin"></i> <a
href="https://github.com/apache/ofbiz-framework";
target="external"><strong>ofbiz-framework trunk on Github</strong></a></li>
- <li><i class="icon-pin"></i> <a
href="https://github.com/apache/ofbiz-plugins";
target="external"><strong>ofbiz-plugins trunk on Github</strong></a></li>
- </ul>
+ <li><i class="icon-pin"></i> <a
href="http://svn.apache.org/viewvc/ofbiz/"; target="_blank"><strong>SVN -
ViewVC</strong></a></li>
+ </ul>
+ <p></p>
+ <p>Our ofbiz-framework trunk and ofbiz-plugins trunk are also available on
Git at the links below:</p>
+ <ul class="iconsList">
+ <li><i class="icon-pin"></i> <a
href="https://github.com/apache/ofbiz-framework";
target="external"><strong>ofbiz-framework trunk on Github</strong></a></li>
+ <li><i class="icon-pin"></i> <a
href="https://github.com/apache/ofbiz-plugins";
target="external"><strong>ofbiz-plugins trunk on Github</strong></a></li>
+ </ul>
</div>
</section>
- <section id="DevTutorial" class="slice row clearfix">
+ <section id="DevTutorial" class="slice row clearfix">
<div class="span10">
<h2>Development Tutorial</h2>
<div class="divider"><span></span></div>
<p>To help you getting started we have put together a
beginners OFBiz development tutorial to get familiar with with OFBiz.</p>
- <p>It covers the fundamentals of the OFBiz application
development process. The goal of this tutorial is to acquaint a developer with
best practices, coding conventions. the control flow and things that the
developer needs to know in order to modify OFBiz</p>
- <ul class="iconsList">
+ <p>It covers the fundamentals of the OFBiz application development
process. The goal of this tutorial is to acquaint a developer with best
practices, coding conventions. the control flow and things that the developer
needs to know in order to modify OFBiz</p>
+ <ul class="iconsList">
<li><i class="icon-pin"></i> <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/OFBiz+Tutorial+-+A+Beginners+Development+Guide";
target=_blank"><strong>Developer Tutorial</strong></a></li>
- </ul>
+ </ul>
</div>
</section>
- <section id="DevDocs" class="slice row clearfix">
+ <section id="DevDocs" class="slice row clearfix">
<div class="span10">
<h2>Documentation and Help</h2>
<div class="divider"><span></span></div>
<p>We have a range of technical documenentation and help for
developers. Please see the links below.</p>
- <ul class="iconsList">
+ <ul class="iconsList">
<li><i class="icon-pin"></i> <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Technical+Documentation";
target="_blank"><strong>OFBiz Technical Documentation</strong></a></li>
- <li><i class="icon-pin"></i> <a
href="https://ci.apache.org/projects/ofbiz/site/javadocs/";
target="_blank"><strong>OFBiz API Reference</strong></a></li>
- <li><i class="icon-pin"></i> <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/FAQ+-+Tips+-+Tricks+-+Cookbook+-+HowTo";
target="_blank"><strong>Developer and Technical FAQs</strong></a></li>
- </ul>
- <p>After consulting the documentation you still have
questions,please feel free to post questions on our development mailing
list.</p>
+ <li><i class="icon-pin"></i> <a
href="https://ci.apache.org/projects/ofbiz/site/javadocs/";
target="_blank"><strong>OFBiz API Reference</strong></a></li>
+ <li><i class="icon-pin"></i> <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/FAQ+-+Tips+-+Tricks+-+Cookbook+-+HowTo";
target="_blank"><strong>Developer and Technical FAQs</strong></a></li>
+ </ul>
+ <p>After consulting the documentation you still have questions,please feel
free to post questions on our development mailing list.</p>
</div>
</section>
- <section id="DevDemo" class="slice row clearfix">
+ <section id="DevDemo" class="slice row clearfix">
<div class="span10">
<h2>Demo</h2>
<div class="divider"><span></span></div>
