0
0
Fork 0
mirror of https://github.com/salesagility/SuiteCRM.git synced 2025-03-18 07:02:57 +00:00

Merge pull request from Dillon-Brown/psr-2-5

PSR2- lowercase constants + keywords
This commit is contained in:
Daniel Samson 2018-07-18 15:28:15 +01:00 committed by GitHub
commit 1170829cfd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
360 changed files with 2239 additions and 2239 deletions
ModuleInstall
Zend
data
include
DetailView
HTMLPurifier
HTTP_WebDAV_Server
InlineEditing
ListView
MVC/View/views
Pear/XML_HTMLSax3
Popups
SearchForm
Smarty
SubPanel
SugarCache
SugarCharts
SugarFields/Fields
SugarLogger
SugarObjects/templates/person
SugarSQLValidate.php
SugarTheme
Sugarpdf
VarDefHandler
dir_inc.php
generic/SugarWidgets
nusoap
pclzip
phpmailer/extras
social/twitter/twitter_auth/twitteroauth
tcpdf
utils
install
jssource
lib
API/JsonApi/v1/Resource
Utility
metadata
modules

View file

@ -1143,7 +1143,7 @@ class ModuleInstaller
$strings = $mod_strings;
}
foreach ($uninstalLabes AS $label) {
foreach ($uninstalLabes as $label) {
if (isset($strings[$label])) {
unset($strings[$label]);
}
@ -1184,7 +1184,7 @@ class ModuleInstaller
continue;
}
foreach (array_keys($GLOBALS['sugar_config']['languages']) AS $language) {
foreach (array_keys($GLOBALS['sugar_config']['languages']) as $language) {
$pathDef = array(
'language' => $language,
'to_module' => $definition['module']
@ -1206,7 +1206,7 @@ class ModuleInstaller
protected function getLabelsToUninstall($labelDefinitions)
{
$labels = array();
foreach ($labelDefinitions AS $definition) {
foreach ($labelDefinitions as $definition) {
$labels[] = $definition['system_label'];
}
return $labels;

View file

@ -71,7 +71,7 @@ class ListViewPackages extends ListViewSmarty
* @param data the data to display on the page
* @param file the template file to parse
*/
public function setup($data, $file, $where, $params = Array(), $offset = 0, $limit = -1, $filter_fields = Array(), $id_field = 'id', $id=NULL)
public function setup($data, $file, $where, $params = array(), $offset = 0, $limit = -1, $filter_fields = array(), $id_field = 'id', $id=null)
{
$this->data = $data;
$this->tpl = $file;

View file

@ -1224,7 +1224,7 @@ class Zend_Gdata_App
*/
public function useObjectMapping($value)
{
if ($value === True) {
if ($value === true) {
$this->_useObjectMapping = true;
} else {
$this->_useObjectMapping = false;

View file

@ -95,7 +95,7 @@ abstract class Zend_Gdata_App_FeedEntryParent extends Zend_Gdata_App_Base
*
* @var string|null
*/
protected $_etag = NULL;
protected $_etag = null;
protected $_author = array();
protected $_category = array();

View file

@ -47,7 +47,7 @@ class Zend_Gdata_Contacts_Extension_Address extends Zend_Gdata_Extension
protected $_rootNamespace = 'gd';
protected $_rootElement = 'structuredPostalAddress';
protected $_isPrimary = FALSE;
protected $_isPrimary = false;
protected $_addressType = null;
protected $_transformMapping = array('work' => 'primary', 'home' => 'alt', '' => 'primary');
/**

View file

@ -46,7 +46,7 @@ class Zend_Gdata_Contacts_Extension_Email extends Zend_Gdata_Extension
protected $_rootNamespace = 'gd';
protected $_rootElement = 'email';
protected $_isPrimary = FALSE;
protected $_isPrimary = false;
protected $_emailType = null;
protected $_email = null;
/**

View file

@ -46,7 +46,7 @@ class Zend_Gdata_Contacts_Extension_PhoneNumber extends Zend_Gdata_Extension
protected $_rootNamespace = 'gd';
protected $_rootElement = 'phoneNumber';
protected $_isPrimaryNumber = FALSE;
protected $_isPrimaryNumber = false;
protected $_phoneType = 'main';
/**

View file

@ -215,19 +215,19 @@ class Zend_Gdata_Contacts_ListEntry extends Zend_Gdata_Entry
{
$results = array();
$primaryEmail = $this->getPrimaryEmail();
if($primaryEmail !== FALSE)
if($primaryEmail !== false)
$results['email1'] = $primaryEmail;
else
{
$nonPrimaryEmail = $this->getNextNonPrimaryEmail();
if($nonPrimaryEmail !== FALSE)
if($nonPrimaryEmail !== false)
$results['email1'] = $nonPrimaryEmail;
else
return array();
}
$secondaryEmail = $this->getNextNonPrimaryEmail();
if($secondaryEmail !== FALSE)
if($secondaryEmail !== false)
$results['email2'] = $secondaryEmail;
return $results;
@ -235,7 +235,7 @@ class Zend_Gdata_Contacts_ListEntry extends Zend_Gdata_Entry
}
protected function getPrimaryEmail()
{
$results = FALSE;
$results = false;
foreach($this->_emails as $emailEntry)
{
if( $emailEntry->isPrimary() )
@ -246,7 +246,7 @@ class Zend_Gdata_Contacts_ListEntry extends Zend_Gdata_Entry
protected function getNextNonPrimaryEmail()
{
$results = FALSE;
$results = false;
foreach($this->_emails as $k => $emailEntry)
{
if( !$emailEntry->isPrimary() )

View file

@ -1278,9 +1278,9 @@ class Zend_Gdata_Gapps extends Zend_Gdata
}
if($results) {
return TRUE;
return true;
} else {
return FALSE;
return false;
}
}
@ -1392,9 +1392,9 @@ class Zend_Gdata_Gapps extends Zend_Gdata
}
if($results) {
return TRUE;
return true;
} else {
return FALSE;
return false;
}
}

View file

@ -97,7 +97,7 @@ class Zend_Gdata_HttpAdapterStreamingSocket extends Zend_Http_Client_Adapter_Soc
//read from $body, write to socket
$chunk = $body->read(self::CHUNK_SIZE);
while ($chunk !== FALSE) {
while ($chunk !== false) {
if (! @fwrite($this->socket, $chunk)) {
require_once 'Zend/Http/Client/Adapter/Exception.php';
throw new Zend_Http_Client_Adapter_Exception(

View file

@ -97,7 +97,7 @@ class Zend_Gdata_MediaMimeStream
$filePath . ' does not exist or is not readable.');
}
$this->_fileHandle = fopen($filePath, 'rb', TRUE);
$this->_fileHandle = fopen($filePath, 'rb', true);
$this->_boundaryString = '=_' . md5(microtime(1) . rand(1, 20));
$entry = $this->wrapEntry($xmlString, $fileContentType);
$closingBoundary = new Zend_Gdata_MimeBodyString("\r\n--{$this->_boundaryString}--\r\n");
@ -136,7 +136,7 @@ class Zend_Gdata_MediaMimeStream
public function read($bytesRequested)
{
if($this->_currentPart >= count($this->_parts)) {
return FALSE;
return false;
}
$activePart = $this->_parts[$this->_currentPart];
@ -145,7 +145,7 @@ class Zend_Gdata_MediaMimeStream
while(strlen($buffer) < $bytesRequested) {
$this->_currentPart += 1;
$nextBuffer = $this->read($bytesRequested - strlen($buffer));
if($nextBuffer === FALSE) {
if($nextBuffer === false) {
break;
}
$buffer .= $nextBuffer;

View file

@ -67,7 +67,7 @@ class Zend_Gdata_MimeBodyString
{
$len = strlen($this->_sourceString);
if($this->_bytesRead == $len) {
return FALSE;
return false;
} elseif($bytesRequested > $len - $this->_bytesRead) {
$bytesRequested = $len - $this->_bytesRead;
}

View file

@ -295,7 +295,7 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac
if (isset($this->_config['curloptions'][CURLOPT_INFILE])) {
// Now we will probably already have Content-Length set, so that we have to delete it
// from $headers at this point:
foreach ($headers AS $k => $header) {
foreach ($headers as $k => $header) {
if (preg_match('/Content-Length:\s*(\d+)/i', $header, $m)) {
if(is_resource($body)) {
$this->_config['curloptions'][CURLOPT_INFILESIZE] = (int)$m[1];

View file

@ -270,7 +270,7 @@ class Zend_Oauth_Client extends Zend_Http_Client
foreach ($queryParts as $queryPart) {
$kvTuple = explode('=', $queryPart);
$params[$kvTuple[0]] =
(array_key_exists(1, $kvTuple) ? $kvTuple[1] : NULL);
(array_key_exists(1, $kvTuple) ? $kvTuple[1] : null);
}
}
if (!empty($this->paramsPost)) {

View file

@ -181,7 +181,7 @@ class Link
$query = $this->getQuery();
}
$result = $this->_db->query($query, true);
$list = Array();
$list = array();
while ($row = $this->_db->fetchByAssoc($result)) {
if ($role) {
$list[] = $row;

View file

@ -89,7 +89,7 @@ class M2MRelationship extends SugarRelationship
$GLOBALS['log']->error("Warning: Multiple links found for relationship {$this->name} within module {$module}");
return $this->getMostAppropriateLinkedDefinition($results);
} else {
return FALSE;
return false;
}
}
@ -368,9 +368,9 @@ class M2MRelationship extends SugarRelationship
$db = DBManagerFactory::getInstance();
$query = $this->getQuery($link, $params);
$result = $db->query($query);
$rows = Array();
$rows = array();
$idField = $link->getSide() == REL_LHS ? $this->def['join_key_rhs'] : $this->def['join_key_lhs'];
while ($row = $db->fetchByAssoc($result, FALSE)) {
while ($row = $db->fetchByAssoc($result, false)) {
if (empty($row['id']) && empty($row[$idField])) {
continue;
}

View file

@ -162,7 +162,7 @@ class One2MBeanRelationship extends One2MRelationship
}
if ($save && !$rhs->deleted) {
$rhs->in_relationship_update = TRUE;
$rhs->in_relationship_update = true;
$rhs->save();
}
@ -198,7 +198,7 @@ class One2MBeanRelationship extends One2MRelationship
return array("rows" => array());
}
$result = $db->query($query);
while ($row = $db->fetchByAssoc($result, FALSE)) {
while ($row = $db->fetchByAssoc($result, false)) {
$id = $row['id'];
$rows[$id] = $row;
}

View file

@ -251,7 +251,7 @@ class DetailView extends ListView
}
}
public function processListNavigation($xtpl, $html_varName, $current_offset, $display_audit_link = false, $next_offset = null, $previous_offset = null, $row_count = null, $sugarbean = NULL, $subpanel_def = NULL, $col_count = 20)
public function processListNavigation($xtpl, $html_varName, $current_offset, $display_audit_link = false, $next_offset = null, $previous_offset = null, $row_count = null, $sugarbean = null, $subpanel_def = null, $col_count = 20)
{
global $export_module, $sugar_config, $current_user;
//intialize audit_link

View file

@ -363,7 +363,7 @@ class HTMLPurifier_Arborize
if ($level > 0) {
$tokens[] = $start;
}
if ($end !== NULL) {
if ($end !== null) {
$closingTokens[$level][] = $end;
}
if ($node instanceof HTMLPurifier_Node_Element) {
@ -8100,7 +8100,7 @@ class HTMLPurifier_Queue
$this->input = array();
}
if (empty($this->output)) {
return NULL;
return null;
}
return array_pop($this->output);
}
@ -9925,10 +9925,10 @@ class HTMLPurifier_Zipper
* the hole with a value. (Usually you should supply a $t, unless you
* are at the end of the array.)
*/
public function toArray($t = NULL)
public function toArray($t = null)
{
$a = $this->front;
if ($t !== NULL) {
if ($t !== null) {
$a[] = $t;
}
for ($i = count($this->back)-1; $i >= 0; $i--) {
@ -9944,10 +9944,10 @@ class HTMLPurifier_Zipper
*/
public function next($t)
{
if ($t !== NULL) {
if ($t !== null) {
array_push($this->front, $t);
}
return empty($this->back) ? NULL : array_pop($this->back);
return empty($this->back) ? null : array_pop($this->back);
}
/**
@ -9971,10 +9971,10 @@ class HTMLPurifier_Zipper
*/
public function prev($t)
{
if ($t !== NULL) {
if ($t !== null) {
array_push($this->back, $t);
}
return empty($this->front) ? NULL : array_pop($this->front);
return empty($this->front) ? null : array_pop($this->front);
}
/**
@ -9984,7 +9984,7 @@ class HTMLPurifier_Zipper
*/
public function delete()
{
return empty($this->back) ? NULL : array_pop($this->back);
return empty($this->back) ? null : array_pop($this->back);
}
/**
@ -10002,7 +10002,7 @@ class HTMLPurifier_Zipper
*/
public function insertBefore($t)
{
if ($t !== NULL) {
if ($t !== null) {
array_push($this->front, $t);
}
}
@ -10013,7 +10013,7 @@ class HTMLPurifier_Zipper
*/
public function insertAfter($t)
{
if ($t !== NULL) {
if ($t !== null) {
array_push($this->back, $t);
}
}
@ -19682,7 +19682,7 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
$e = $context->get('ErrorCollector', true);
$i = false; // injector index
list($zipper, $token) = HTMLPurifier_Zipper::fromArray($tokens);
if ($token === NULL) {
if ($token === null) {
return array();
}
$reprocess = false; // whether or not to reprocess the same token
@ -19788,7 +19788,7 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
}
// handle case of document end
if ($token === NULL) {
if ($token === null) {
// kill processing if stack is empty
if (empty($this->stack)) {
break;

View file

@ -456,7 +456,7 @@ class HTTP_WebDAV_Server
*/
public function http_PROPFIND()
{
$options = Array();
$options = array();
$options["path"] = $this->path;
// search depth from header (default is "infinity)
@ -730,7 +730,7 @@ class HTTP_WebDAV_Server
public function http_PROPPATCH()
{
if ($this->_check_lock_status($this->path)) {
$options = Array();
$options = array();
$options["path"] = $this->path;
$propinfo = new _parse_proppatch("php://input");
@ -786,7 +786,7 @@ class HTTP_WebDAV_Server
*/
public function http_MKCOL()
{
$options = Array();
$options = array();
$options["path"] = $this->path;
$stat = $this->mkcol($options);
@ -808,7 +808,7 @@ class HTTP_WebDAV_Server
public function http_GET()
{
// TODO check for invalid stream
$options = Array();
$options = array();
$options["path"] = $this->path;
$this->_get_ranges($options);
@ -1000,7 +1000,7 @@ class HTTP_WebDAV_Server
public function http_HEAD()
{
$status = false;
$options = Array();
$options = array();
$options["path"] = $this->path;
if (method_exists($this, "HEAD")) {
@ -1034,7 +1034,7 @@ class HTTP_WebDAV_Server
public function http_PUT()
{
if ($this->_check_lock_status($this->path)) {
$options = Array();
$options = array();
$options["path"] = $this->path;
$options["content_length"] = $_SERVER["CONTENT_LENGTH"];
@ -1166,7 +1166,7 @@ class HTTP_WebDAV_Server
// check lock status
if ($this->_check_lock_status($this->path)) {
// ok, proceed
$options = Array();
$options = array();
$options["path"] = $this->path;
$stat = $this->delete($options);
@ -1228,7 +1228,7 @@ class HTTP_WebDAV_Server
*/
public function http_LOCK()
{
$options = Array();
$options = array();
$options["path"] = $this->path;
if (isset($_SERVER['HTTP_DEPTH'])) {
@ -1326,7 +1326,7 @@ class HTTP_WebDAV_Server
*/
public function http_UNLOCK()
{
$options = Array();
$options = array();
$options["path"] = $this->path;
if (isset($_SERVER['HTTP_DEPTH'])) {
@ -1352,7 +1352,7 @@ class HTTP_WebDAV_Server
public function _copymove($what)
{
$options = Array();
$options = array();
$options["path"] = $this->path;
if (isset($_SERVER["HTTP_DEPTH"])) {

View file

@ -341,12 +341,12 @@ function saveField($field, $id, $module, $value)
$bean->$field = $value;
}
$check_notify = FALSE;
$check_notify = false;
if (isset($bean->fetched_row['assigned_user_id']) && $field == "assigned_user_name") {
$old_assigned_user_id = $bean->fetched_row['assigned_user_id'];
if (!empty($value) && ($old_assigned_user_id != $value) && ($value != $current_user->id)) {
$check_notify = TRUE;
$check_notify = true;
}
}

View file

@ -112,7 +112,7 @@ class ListView
{
global $sugar_config;
$populateOnly = $this->ignorePopulateOnly ? FALSE : (!empty($sugar_config['save_query']) && $sugar_config['save_query'] == 'populate_only');
$populateOnly = $this->ignorePopulateOnly ? false : (!empty($sugar_config['save_query']) && $sugar_config['save_query'] == 'populate_only');
if (isset($seed->module_dir) && $populateOnly) {
if (empty($GLOBALS['displayListView']) && strcmp(strtolower($_REQUEST['action']), 'popup') != 0 && (!empty($_REQUEST['clear_query']) || $_REQUEST['module'] == $seed->module_dir && ((empty($_REQUEST['query']) || $_REQUEST['query'] == 'MSI')&& (empty($_SESSION['last_search_mod']) || $_SESSION['last_search_mod'] != $seed->module_dir)))) {
$_SESSION['last_search_mod'] = $_REQUEST['module'] ;
@ -450,10 +450,10 @@ class ListView
$fieldType = isset($vardef['custom_type'])?$vardef['custom_type']:$vardef['type'];
$tmpField = SugarFieldHandler::getSugarField($fieldType, true);
} else {
$tmpField = NULL;
$tmpField = null;
}
if ($tmpField != NULL) {
if ($tmpField != null) {
$widget_contents = SugarFieldHandler::displaySmarty($list_field['fields'], $vardef, 'ListView', $list_field);
} else {
// No SugarField for this particular type

View file

@ -187,7 +187,7 @@ if (!defined('sugarEntry') || !sugarEntry) {
}
}
public function display($title = '', $section = 'main', $return = FALSE)
public function display($title = '', $section = 'main', $return = false)
{
if ($this->type == 1) {
ob_start();

View file

@ -300,12 +300,12 @@ class ListViewSmarty extends ListViewDisplay
'of' => $app_strings['LBL_LIST_OF']);
$this->ss->assign('navStrings', $navStrings);
$displayEmptyDataMessages = TRUE;
$displayEmptyDataMessages = true;
//TODO: Cleanup, better logic for which modules are exempt from the new messaging.
$modulesExemptFromEmptyDataMessages = array('WorkFlow','ContractTypes', 'OAuthKeys', 'TimePeriods');
if ((isset($GLOBALS['moduleTabMap'][$currentModule]) && $GLOBALS['moduleTabMap'][$currentModule] == 'Administration')
|| isset($GLOBALS['adminOnlyList'][$currentModule]) || in_array($currentModule, $modulesExemptFromEmptyDataMessages)) {
$displayEmptyDataMessages = FALSE;
$displayEmptyDataMessages = false;
}
$this->ss->assign('displayEmptyDataMesssages', $displayEmptyDataMessages);

View file

@ -79,7 +79,7 @@ class ViewPopup extends SugarView
{
global $popupMeta, $mod_strings;
if (($this->bean instanceOf SugarBean) && !$this->bean->ACLAccess('list')) {
if (($this->bean instanceof SugarBean) && !$this->bean->ACLAccess('list')) {
ACLController::displayNoAccess();
sugar_cleanup(true);
}

View file

@ -77,7 +77,7 @@ class ViewQuickcreate extends ViewAjax
{
if (!empty($_REQUEST['source_module']) && $_REQUEST['source_module'] != 'undefined' && !empty($_REQUEST['record'])) {
$this->bean = loadBean($_REQUEST['source_module']);
if ($this->bean instanceOf SugarBean
if ($this->bean instanceof SugarBean
&& !in_array($this->bean->object_name, array('EmailMan'))) {
$this->bean->retrieve($_REQUEST['record']);
if (!empty($this->bean->id)) {

View file

@ -81,7 +81,7 @@ class ViewQuickedit extends ViewAjax
{
if (!empty($_REQUEST['source_module']) && $_REQUEST['source_module'] != 'undefined' && !empty($_REQUEST['record'])) {
$this->bean = loadBean($_REQUEST['source_module']);
if ($this->bean instanceOf SugarBean
if ($this->bean instanceof SugarBean
&& !in_array($this->bean->object_name, array('EmailMan'))) {
$this->bean->retrieve($_REQUEST['record']);
if (!empty($this->bean->id)) {
@ -125,7 +125,7 @@ class ViewQuickedit extends ViewAjax
*/
public function display()
{
if (($this->bean instanceOf SugarBean) && !$this->bean->ACLAccess('edit')) {
if (($this->bean instanceof SugarBean) && !$this->bean->ACLAccess('edit')) {
$no_defs_js = '<script>SUGAR.ajaxUI.loadContent("index.php?module=' . $this->bean->module_dir . '&action=Noaccess&record=' . $this->bean->id.'")</script>';
echo json_encode(array('scriptOnly'=> $no_defs_js));
return;

View file

@ -57,7 +57,7 @@ class ViewSugarpdf extends SugarView
* The atributs of this object are destroy in the output method.
* @var Sugarpdf object
*/
public $sugarpdfBean=NULL;
public $sugarpdfBean=null;
public function __construct()

View file

@ -229,7 +229,7 @@ class XML_HTMLSax3_StateParser
{
$start = $this->position;
$this->position = strpos($this->rawtext, $string, $start);
if ($this->position === FALSE) {
if ($this->position === false) {
$this->position = $this->length;
}
return substr($this->rawtext, $start, $this->position - $start);
@ -377,7 +377,7 @@ class XML_HTMLSax3_StateParser_Lt430 extends XML_HTMLSax3_StateParser
public function scanUntilCharacters($string)
{
$startpos = $this->position;
while ($this->position < $this->length && strpos($string, $this->rawtext{$this->position}) === FALSE) {
while ($this->position < $this->length && strpos($string, $this->rawtext{$this->position}) === false) {
$this->position++;
}
return substr($this->rawtext, $startpos, $this->position - $startpos);
@ -391,7 +391,7 @@ class XML_HTMLSax3_StateParser_Lt430 extends XML_HTMLSax3_StateParser
public function ignoreWhitespace()
{
while ($this->position < $this->length &&
strpos(" \n\r\t", $this->rawtext{$this->position}) !== FALSE) {
strpos(" \n\r\t", $this->rawtext{$this->position}) !== false) {
$this->position++;
}
}

View file

@ -131,7 +131,7 @@ class XML_HTMLSax3_CaseFolding
* @param array tag attributes
* @access protected
*/
public function foldOpen(&$parser, $tag, $attrs=array(), $empty = FALSE)
public function foldOpen(&$parser, $tag, $attrs=array(), $empty = false)
{
$this->orig_obj->{$this->orig_open_method}($parser, strtoupper($tag), $attrs, $empty);
}
@ -141,7 +141,7 @@ class XML_HTMLSax3_CaseFolding
* @param string tag name
* @access protected
*/
public function foldClose(&$parser, $tag, $empty = FALSE)
public function foldClose(&$parser, $tag, $empty = false)
{
$this->orig_obj->{$this->orig_close_method}($parser, strtoupper($tag), $empty);
}

View file

@ -117,7 +117,7 @@ class XML_HTMLSax3_ClosingTagState
}
}
$context->handler_object_element->
{$context->handler_method_closing}($context->htmlsax, $tag, FALSE);
{$context->handler_method_closing}($context->htmlsax, $tag, false);
}
return XML_HTMLSAX3_STATE_START;
}
@ -144,7 +144,7 @@ class XML_HTMLSax3_OpeningTagState
$context->ignoreWhitespace();
$attributename = $context->scanUntilCharacters("=/> \n\r\t");
while ($attributename != '') {
$attributevalue = NULL;
$attributevalue = null;
$context->ignoreWhitespace();
$char = $context->scanCharacter();
if ($char == '=') {
@ -161,8 +161,8 @@ class XML_HTMLSax3_OpeningTagState
$attributevalue =
$context->scanUntilCharacters("> \n\r\t");
}
} elseif ($char !== NULL) {
$attributevalue = NULL;
} elseif ($char !== null) {
$attributevalue = null;
$context->unscanCharacter();
}
$Attributes[$attributename] = $attributevalue;
@ -192,14 +192,14 @@ class XML_HTMLSax3_OpeningTagState
}
$context->handler_object_element->
{$context->handler_method_opening}($context->htmlsax, $tag,
$Attributes, TRUE);
$Attributes, true);
$context->handler_object_element->
{$context->handler_method_closing}($context->htmlsax, $tag,
TRUE);
true);
} else {
$context->handler_object_element->
{$context->handler_method_opening}($context->htmlsax, $tag,
$Attributes, FALSE);
$Attributes, false);
}
}
return XML_HTMLSAX3_STATE_START;

View file

@ -298,10 +298,10 @@ class PopupSmarty extends ListViewSmarty
$seed,
$file = null,
$where = null,
$params = Array(),
$params = array(),
$offset = 0,
$limit = -1,
$filter_fields = Array(),
$filter_fields = array(),
$id_field = 'id',
$id = null
) {

View file

@ -534,9 +534,9 @@ class SearchForm
}
}
if (!empty($_REQUEST['assigned_user_id'])) {
$this->xtpl->assign("USER_FILTER", get_select_options_with_id(get_user_array(FALSE), $_REQUEST['assigned_user_id']));
$this->xtpl->assign("USER_FILTER", get_select_options_with_id(get_user_array(false), $_REQUEST['assigned_user_id']));
} else {
$this->xtpl->assign("USER_FILTER", get_select_options_with_id(get_user_array(FALSE), ''));
$this->xtpl->assign("USER_FILTER", get_select_options_with_id(get_user_array(false), ''));
}
// handle my items only

View file

@ -74,7 +74,7 @@ class Config_File
*
* @param string $config_path (optional) path to the config files
*/
public function __construct($config_path = NULL)
public function __construct($config_path = null)
{
if (isset($config_path)) {
$this->set_path($config_path);
@ -111,7 +111,7 @@ class Config_File
* @param string $var_name (optional) variable to get info for
* @return string|array a value or array of values
*/
public function get($file_name, $section_name = NULL, $var_name = NULL)
public function get($file_name, $section_name = null, $var_name = null)
{
if (empty($file_name)) {
$this->_trigger_error_msg('Empty config file name');
@ -197,7 +197,7 @@ class Config_File
* @param string $section_name (optional) section to get info for
* @return array an array of variables names from the specified file/section
*/
public function get_var_names($file_name, $section = NULL)
public function get_var_names($file_name, $section = null)
{
if (empty($file_name)) {
$this->_trigger_error_msg('Empty config file name');
@ -220,9 +220,9 @@ class Config_File
*
* @param string $file_name file to clear config data for
*/
public function clear($file_name = NULL)
public function clear($file_name = null)
{
if ($file_name === NULL) {
if ($file_name === null) {
$this->_config_data = array();
} elseif (isset($this->_config_data[$file_name])) {
$this->_config_data[$file_name] = array();

View file

@ -1055,7 +1055,7 @@ class Smarty_Compiler extends Smarty
$arg_list = array();
foreach ($attrs as $arg_name => $arg_value) {
if ($arg_name != 'file' AND $arg_name != 'once' AND $arg_name != 'assign') {
if ($arg_name != 'file' and $arg_name != 'once' and $arg_name != 'assign') {
if (is_bool($arg_value)) {
$arg_value = $arg_value ? 'true' : 'false';
}

View file

@ -1,7 +1,7 @@
<?php
function smarty_block_minify($params, $content, &$smarty, &$repeat)
{
if (!$repeat && isSet($content)) {
if (!$repeat && isset($content)) {
// HTML Minifier
$input = $content;
if (trim($input) === "") {

View file

@ -111,7 +111,7 @@ function smarty_function_sugar_evalcolumn($params, &$smarty)
// Add a string replace to swap out @@FIELD@@ for the actual field,
// we can't do this through customCode directly because the sugar_field smarty function returns smarty code to run on the second pass
if (!empty($code) && strpos($code, '@@FIELD@@') !== FALSE) {
if (!empty($code) && strpos($code, '@@FIELD@@') !== false) {
// First we need to fetch extra data about the field
// sfp == SugarFieldParams
$sfp = $params;

View file

@ -423,7 +423,7 @@ class SubPanel
if (isset($subpanel_defs['searchdefs'])) {
$searchdefs[$module]['layout']['basic_search'] = $subpanel_defs['searchdefs'];
$searchdefs[$module]['templateMeta'] = Array ('maxColumns' => 3, 'maxColumnsBasic' => 4, 'widths' => Array ( 'label' => 10, 'field' => 30 )) ;
$searchdefs[$module]['templateMeta'] = array ('maxColumns' => 3, 'maxColumnsBasic' => 4, 'widths' => array ( 'label' => 10, 'field' => 30 )) ;
return $searchdefs;
}

View file

@ -173,7 +173,7 @@ abstract class SugarCacheAbstract
$this->_localStore[$key] = $value;
}
if ($ttl === NULL) {
if ($ttl === null) {
$this->_setExternal($this->_keyPrefix.$key, $value);
} elseif ($ttl > 0) {
//For BC reasons the setExternal signature will remain the same.

View file

@ -94,7 +94,7 @@ class SugarCacheMemcache extends SugarCacheAbstract
*/
protected function _getMemcacheObject()
{
if (!($this->_memcache instanceOf Memcache)) {
if (!($this->_memcache instanceof Memcache)) {
$this->_memcache = new Memcache();
$config = SugarConfig::getInstance();
$this->_host = $config->get('external_cache.memcache.host', $this->_host);

View file

@ -89,7 +89,7 @@ class SugarCacheMemcached extends SugarCacheAbstract
*/
protected function _getMemcachedObject()
{
if (!($this->_memcached instanceOf Memcached)) {
if (!($this->_memcached instanceof Memcached)) {
$this->_memcached = new Memcached();
$this->_host = SugarConfig::getInstance()->get('external_cache.memcache.host', $this->_host);
$this->_port = SugarConfig::getInstance()->get('external_cache.memcache.port', $this->_port);

View file

@ -97,7 +97,7 @@ class SugarCacheRedis extends SugarCacheAbstract
protected function _getRedisObject()
{
try {
if (!($this->_redis instanceOf Redis)) {
if (!($this->_redis instanceof Redis)) {
$this->_redis = new Redis();
$this->_host = SugarConfig::getInstance()->get('external_cache.redis.host', $this->_host);
$this->_port = SugarConfig::getInstance()->get('external_cache.redis.port', $this->_port);

View file

@ -679,7 +679,7 @@ class JsChart extends SugarChart
}
// write the contents to the file
if (fwrite($fh, $jsonContents) === FALSE) {
if (fwrite($fh, $jsonContents) === false) {
$GLOBALS['log']->debug("Cannot write to file ($this->jsonFilename)");
return false;
}

View file

@ -731,7 +731,7 @@ class SugarChart
}
// write the contents to the file
if (fwrite($fh, $xmlContents) === FALSE) {
if (fwrite($fh, $xmlContents) === false) {
$GLOBALS['log']->debug("Cannot write to file ($xmlFilename)");
return false;
}

View file

@ -109,7 +109,7 @@ class SugarFieldCurrency extends SugarFieldFloat
// for currency fields, use the user or system precision, not the precision in the vardef
//this is achived by passing in $precision as null
$precision = null;
if ($rawField === '' || $rawField === NULL) {
if ($rawField === '' || $rawField === null) {
return '';
}
return format_number($rawField, $precision, $precision);

View file

@ -51,7 +51,7 @@ class SugarFieldFloat extends SugarFieldInt
$precision = $vardef['precision'];
}
if ($rawField === '' || $rawField === NULL) {
if ($rawField === '' || $rawField === null) {
return '';
}
@ -60,7 +60,7 @@ class SugarFieldFloat extends SugarFieldInt
public function unformatField($formattedField, $vardef)
{
if ($formattedField === '' || $formattedField === NULL) {
if ($formattedField === '' || $formattedField === null) {
return '';
}
return (float)unformat_number($formattedField);

View file

@ -49,7 +49,7 @@ class SugarFieldInt extends SugarFieldBase
if (!empty($vardef['disable_num_format'])) {
return $rawField;
}
if ($rawField === '' || $rawField === NULL) {
if ($rawField === '' || $rawField === null) {
return '';
}
@ -58,7 +58,7 @@ class SugarFieldInt extends SugarFieldBase
public function unformatField($formattedField, $vardef)
{
if ($formattedField === '' || $formattedField === NULL) {
if ($formattedField === '' || $formattedField === null) {
return '';
}
return (int)unformat_number($formattedField);

View file

@ -56,7 +56,7 @@ class LoggerManager
/**
* @var null|LoggerManager
*/
private static $_instance = NULL;
private static $_instance = null;
//these are the mappings for levels to different log types
private static $_logMapping = array(

View file

@ -292,7 +292,7 @@ class SugarLogger implements LoggerTemplate
{
if ($this->fp) {
fclose($this->fp);
$this->fp = FALSE;
$this->fp = false;
}
}
}

View file

@ -259,7 +259,7 @@ class Person extends Basic
) {
parent::populateRelatedBean($newBean);
if ($newBean instanceOf Company) {
if ($newBean instanceof Company) {
$newBean->phone_fax = $this->phone_fax;
$newBean->phone_office = $this->phone_work;
$newBean->phone_alternate = $this->phone_other;

View file

@ -246,7 +246,7 @@ class SugarSQLValidate
return false;
}
foreach ($parts AS $part) {
foreach ($parts as $part) {
//the user_hash column is forbidden in passed in SQL
if ($part == "user_hash") {
return false;

View file

@ -691,7 +691,7 @@ EOHTML;
} elseif (is_file($this->getTemplatePath().'/'.$templateName)) {
$templatePath = $this->getTemplatePath().'/'.$templateName;
} elseif (isset($this->parentTheme)
&& SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
&& SugarThemeRegistry::get($this->parentTheme) instanceof SugarTheme
&& ($filename = SugarThemeRegistry::get($this->parentTheme)->getTemplate($templateName)) != '') {
$templatePath = $filename;
} elseif (is_file('custom/'.$this->getDefaultTemplatePath().'/'.$templateName)) {
@ -924,7 +924,7 @@ EOHTML;
} elseif (($filename = $this->_getImageFileName($this->getImagePath().'/'.$imageName)) != '') {
$imagePath = $filename;
} elseif (isset($this->parentTheme)
&& SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
&& SugarThemeRegistry::get($this->parentTheme) instanceof SugarTheme
&& ($filename = SugarThemeRegistry::get($this->parentTheme)->getImageURL($imageName, false)) != '') {
$imagePath = $filename;
} elseif (($filename = $this->_getImageFileName('custom/'.$this->getDefaultImagePath().'/'.$imageName)) != '') {
@ -1005,7 +1005,7 @@ EOHTML;
$defaultFileName = $this->getDefaultCSSPath().'/'.$cssFileName;
$fullFileName = $this->getCSSPath().'/'.$cssFileName;
if (isset($this->parentTheme)
&& SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
&& SugarThemeRegistry::get($this->parentTheme) instanceof SugarTheme
&& ($filename = SugarThemeRegistry::get($this->parentTheme)->getCSSURL($cssFileName, false)) != '') {
$cssFileContents .= file_get_contents($filename);
} else {
@ -1084,7 +1084,7 @@ EOHTML;
$fullFileName = $this->getJSPath().'/'.$jsFileName;
$defaultFileName = $this->getDefaultJSPath().'/'.$jsFileName;
if (isset($this->parentTheme)
&& SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
&& SugarThemeRegistry::get($this->parentTheme) instanceof SugarTheme
&& ($filename = SugarThemeRegistry::get($this->parentTheme)->getJSURL($jsFileName, false)) != '' && !in_array($jsFileName, $this->ignoreParentFiles)) {
$jsFileContents .= file_get_contents($filename);
} else {
@ -1138,7 +1138,7 @@ EOHTML;
// first, lets get all the paths of where to look
$pathsToSearch = array($this->getImagePath());
$theme = $this;
while (isset($theme->parentTheme) && SugarThemeRegistry::get($theme->parentTheme) instanceOf SugarTheme) {
while (isset($theme->parentTheme) && SugarThemeRegistry::get($theme->parentTheme) instanceof SugarTheme) {
$theme = SugarThemeRegistry::get($theme->parentTheme);
$pathsToSearch[] = $theme->getImagePath();
}

View file

@ -206,7 +206,7 @@ class FontManager
return false;
}
@include($this->fontPath.$this->filename);
if ((!isset($type)) OR (!isset($cw))) {
if ((!isset($type)) or (!isset($cw))) {
//The font definition file has a bad format
return false;
}

View file

@ -169,8 +169,8 @@ class Sugarpdf extends TCPDF
$this->setHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE, PDF_HEADER_STRING);
// set header and footer fonts
$this->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
$this->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
$this->setHeaderFont(array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
$this->setFooterFont(array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
//set margins
$this->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
@ -178,7 +178,7 @@ class Sugarpdf extends TCPDF
$this->setFooterMargin(PDF_MARGIN_FOOTER);
//set auto page breaks
$this->SetAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
$this->SetAutoPageBreak(true, PDF_MARGIN_BOTTOM);
//set image scale factor
$this->setImageScale(PDF_IMAGE_SCALE_RATIO);
@ -214,16 +214,16 @@ class Sugarpdf extends TCPDF
$headerfont = $this->getHeaderFont();
$headerdata = $this->getHeaderData();
if (($headerdata['logo']) AND ($headerdata['logo'] != K_BLANK_IMAGE)) {
if (($headerdata['logo']) and ($headerdata['logo'] != K_BLANK_IMAGE)) {
// START SUGARPDF
$logo = K_PATH_CUSTOM_IMAGES.$headerdata['logo'];
$imsize = @getimagesize($logo);
if ($imsize === FALSE) {
if ($imsize === false) {
// encode spaces on filename
$logo = str_replace(' ', '%20', $logo);
$imsize = @getimagesize($logo);
if ($imsize === FALSE) {
if ($imsize === false) {
$logo = K_PATH_IMAGES.$headerdata['logo'];
}
}
@ -329,7 +329,7 @@ class Sugarpdf extends TCPDF
* @param $options Array which can contain : width (array 'column name'=>'width value + % OR nothing'), isheader (bool), header (array), fill (string: HTML color), ishtml (bool) default: false, border (0: no border (defaul), 1: frame or all of the following characters: L ,T ,R ,B), align (L: left align, C: center, R: right align, J: justification), stretch (array 'column name'=>stretch type)
* @see MultiCell()
*/
public function writeCellTable($item, $options=NULL)
public function writeCellTable($item, $options=null)
{
// Save initial font values
$fontFamily = $this->getFontFamily();
@ -433,7 +433,7 @@ class Sugarpdf extends TCPDF
* @param $options Array which can contain : table (array of "HTML proprty"=>"value"),td (array of "HTML proprty"=>"value"), tr (array of "HTML proprty"=>"value"), isheader(bool), header (array of "HTML proprty"=>"value"), width (array 'column name'=>'width value + unit OR nothing')
* @return the HTML code if $returnHtml set to true
*/
public function writeHTMLTable($item, $returnHtml=false, $options=NULL)
public function writeHTMLTable($item, $returnHtml=false, $options=null)
{
//TODO ISSUE - width in % for the td have to be multiply by the number of column.
// ex: for a width of 20% in a table of 6 columns the width will have to be 120% (20*6).
@ -640,7 +640,7 @@ class Sugarpdf extends TCPDF
public function getNumLines($txt, $w=0)
{
$lines = 0;
if (empty($w) OR ($w <= 0)) {
if (empty($w) or ($w <= 0)) {
if ($this->rtl) {
$w = $this->x - $this->lMargin;
} else {

View file

@ -55,7 +55,7 @@ if (isset($this->field_defs['assigned_user_name'])) {
'source' => 'non-db',
'link' => 'assigned_user_link',
'id_name' => 'assigned_user_id',
'massupdate' => FALSE
'massupdate' => false
)
);
}

View file

@ -149,7 +149,7 @@ function rmdir_recursive($path)
}
$d->close();
$rmOk = @rmdir($path);
if ($rmOk === FALSE) {
if ($rmOk === false) {
$GLOBALS['log']->error("ERROR: Unable to remove directory $path");
}
return($status);

View file

@ -82,7 +82,7 @@ class SugarWidgetFieldRelate extends SugarWidgetReportField
private function displayInputQuery($layout_def)
{
$title = $layout_def['rname'];
$bean = isset($layout_def['module']) ? BeanFactory::getBean($layout_def['module']) : NULL;
$bean = isset($layout_def['module']) ? BeanFactory::getBean($layout_def['module']) : null;
$table = empty($bean) ? $layout_def['table'] : $bean->table_name;
$concat_fields = isset($layout_def['db_concat_fields']) ? $layout_def['db_concat_fields'] : '';

View file

@ -47,7 +47,7 @@ if (!defined('sugarEntry') || !sugarEntry) {
class SugarWidgetSubPanelTopArchiveEmailButton extends SugarWidgetSubPanelTopButton
{
public function display($defines, $additionalFormFields = NULL, $nonbutton = false)
public function display($defines, $additionalFormFields = null, $nonbutton = false)
{
if ((ACLController::moduleSupportsACL($defines['module']) && !ACLController::checkAccess($defines['module'], 'edit', true) ||
$defines['module'] == "History" & !ACLController::checkAccess("Emails", 'edit', true))) {

View file

@ -52,7 +52,7 @@ class SugarWidgetSubPanelTopCreateAccountNameButton extends SugarWidgetSubPanelT
return parent::getWidgetId();
}
public function display($defines, $additionalFormFields = NULL, $nonbutton = false)
public function display($defines, $additionalFormFields = null, $nonbutton = false)
{
global $app_strings;
global $currentModule;

View file

@ -52,7 +52,7 @@ class SugarWidgetSubPanelTopCreateLeadNameButton extends SugarWidgetSubPanelTopB
return parent::getWidgetId();
}
public function display($defines, $additionalFormFields = NULL, $nonbutton = false)
public function display($defines, $additionalFormFields = null, $nonbutton = false)
{
global $app_strings;
global $currentModule;

View file

@ -42,7 +42,7 @@ if (!defined('sugarEntry') || !sugarEntry) {
class SugarWidgetSubPanelTopFilterButton extends SugarWidgetSubPanelTopButton
{
public function display($defines, $additionalFormFields = NULL, $nonbutton = false)
public function display($defines, $additionalFormFields = null, $nonbutton = false)
{
global $app_strings;

View file

@ -47,7 +47,7 @@ if (!defined('sugarEntry') || !sugarEntry) {
class SugarWidgetSubPanelTopSelectAccountButton extends SugarWidgetSubPanelTopSelectButton
{
public function display($widget_data, $additionalFormFields = NULL, $nonbutton = false)
public function display($widget_data, $additionalFormFields = null, $nonbutton = false)
{
/*
* i.dymovsky

View file

@ -78,7 +78,7 @@ class SugarWidgetSubPanelTopSelectButton extends SugarWidgetSubPanelTopButton
return $GLOBALS['app_strings']['LBL_SELECT_BUTTON_LABEL'];
}
//widget_data is the collection of attributes associated with the button in the layout_defs file.
public function display($widget_data, $additionalFormFields = NULL, $nonbutton = false)
public function display($widget_data, $additionalFormFields = null, $nonbutton = false)
{
global $app_strings;
$initial_filter = '';

View file

@ -74,7 +74,7 @@ class SugarWidgetSubPanelTopSelectContactsButton extends SugarWidgetSubPanelTopS
}
//widget_data is the collection of attributes associated with the button in the layout_defs file.
public function display($widget_data, $additionalFormFields = NULL, $nonbutton = false)
public function display($widget_data, $additionalFormFields = null, $nonbutton = false)
{
global $app_strings;
$initial_filter = '';

View file

@ -73,7 +73,7 @@ class SugarWidgetSubPanelTopSelectUsersButton extends SugarWidgetSubPanelTopSele
return $GLOBALS['app_strings']['LBL_SELECT_USER_BUTTON_LABEL'];
}
//widget_data is the collection of attributes associated with the button in the layout_defs file.
public function display($widget_data, $additionalFormFields = NULL, $nonbutton = false)
public function display($widget_data, $additionalFormFields = null, $nonbutton = false)
{
global $app_strings;
$initial_filter = '';

View file

@ -47,7 +47,7 @@ if (!defined('sugarEntry') || !sugarEntry) {
class SugarWidgetSubPanelTopSummaryButton extends SugarWidgetSubPanelTopButton
{
public function display($widget_data, $additionalFormFields = NULL, $nonbutton = false)
public function display($widget_data, $additionalFormFields = null, $nonbutton = false)
{
global $app_strings;
global $currentModule;

View file

@ -984,10 +984,10 @@ function timestamp_to_iso8601($timestamp, $utc=true)
{
$datestr = date('Y-m-d\TH:i:sO', $timestamp);
$pos = strrpos($datestr, "+");
if ($pos === FALSE) {
if ($pos === false) {
$pos = strrpos($datestr, "-");
}
if ($pos !== FALSE) {
if ($pos !== false) {
if (strlen($datestr) == $pos + 5) {
$datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);
}

View file

@ -88,8 +88,8 @@ class nusoap_parser extends nusoap_base
public $fault_detail = '';
public $depth_array = array();
public $debug_flag = true;
public $soapresponse = NULL; // parsed SOAP Body
public $soapheader = NULL; // parsed SOAP Header
public $soapresponse = null; // parsed SOAP Body
public $soapheader = null; // parsed SOAP Header
public $responseHeaders = ''; // incoming SOAP headers (text)
public $body_position = 0;
// for multiref parsing:
@ -121,7 +121,7 @@ class nusoap_parser extends nusoap_base
if (!empty($xml)) {
// Check XML encoding
$pos_xml = strpos($xml, '<?xml');
if ($pos_xml !== FALSE) {
if ($pos_xml !== false) {
$xml_decl = substr($xml, $pos_xml, strpos($xml, '?>', $pos_xml + 2) - $pos_xml + 1);
if (preg_match("/encoding=[\"']([^\"']*)[\"']/", $xml_decl, $res)) {
$xml_encoding = $res[1];

View file

@ -90,7 +90,7 @@ class nusoap_server extends nusoap_base
* @var mixed
* @access public
*/
public $requestHeader = NULL;
public $requestHeader = null;
/**
* SOAP body request portion (incomplete namespace resolution; special characters not escaped) (text)
* @var string

View file

@ -111,7 +111,7 @@ class soap_transport_http extends nusoap_base
* @param boolean $use_curl Whether to try to force cURL use
* @access public
*/
public function soap_transport_http($url, $curl_options = NULL, $use_curl = false)
public function soap_transport_http($url, $curl_options = null, $use_curl = false)
{
parent::nusoap_base();
$this->debug("ctor url=$url use_curl=$use_curl curl_options:");
@ -479,7 +479,7 @@ class soap_transport_http extends nusoap_base
* @return string data
* @access public
*/
public function send($data, $timeout=0, $response_timeout=30, $cookies=NULL)
public function send($data, $timeout=0, $response_timeout=30, $cookies=null)
{
$this->debug('entered send() with data of length: '.strlen($data));
@ -714,7 +714,7 @@ class soap_transport_http extends nusoap_base
// read chunk-size, chunk-extension (if any) and CRLF
// get the position of the linebreak
$chunkend = strpos($buffer, $lb);
if ($chunkend == FALSE) {
if ($chunkend == false) {
$this->debug('no linebreak found in decodeChunked');
return $new;
}
@ -727,7 +727,7 @@ class soap_transport_http extends nusoap_base
$chunkend = strpos($buffer, $lb, $chunkstart + $chunk_size);
// Just in case we got a broken connection
if ($chunkend == FALSE) {
if ($chunkend == false) {
$chunk = substr($buffer, $chunkstart);
// append chunk-data to entity-body
$new .= $chunk;
@ -745,7 +745,7 @@ class soap_transport_http extends nusoap_base
$chunkstart = $chunkend + strlen($lb);
$chunkend = strpos($buffer, $lb, $chunkstart) + strlen($lb);
if ($chunkend == FALSE) {
if ($chunkend == false) {
break; //Just in case we got a broken connection
}
$temp = substr($buffer, $chunkstart, $chunkend-$chunkstart);
@ -813,7 +813,7 @@ class soap_transport_http extends nusoap_base
* @return boolean true if OK, false if problem
* @access private
*/
public function sendRequest($data, $cookies = NULL)
public function sendRequest($data, $cookies = null)
{
// build cookie string
$cookie_str = $this->getCookiesForRequest($cookies, (($this->scheme == 'ssl') || ($this->scheme == 'https')));
@ -1315,7 +1315,7 @@ class soap_transport_http extends nusoap_base
}
$cookie_param = ';secure;';
if (strpos($cookie_str, $cookie_param) !== FALSE) {
if (strpos($cookie_str, $cookie_param) !== false) {
$secure = true;
} else {
$secure = false;

View file

@ -182,7 +182,7 @@ class nusoap_client extends nusoap_base
public $certRequest = array(); // Certificate for HTTP SSL authentication
public $requestHeaders = false; // SOAP headers in request (text)
public $responseHeaders = ''; // SOAP headers from response (incomplete namespace resolution) (text)
public $responseHeader = NULL; // SOAP Header from response (parsed)
public $responseHeader = null; // SOAP Header from response (parsed)
public $document = ''; // SOAP body response portion (incomplete namespace resolution) (text)
public $endpoint;
public $forceEndpoint = ''; // overrides WSDL endpoint

View file

@ -1181,10 +1181,10 @@ function timestamp_to_iso8601($timestamp, $utc=true)
{
$datestr = date('Y-m-d\TH:i:sO', $timestamp);
$pos = strrpos($datestr, "+");
if ($pos === FALSE) {
if ($pos === false) {
$pos = strrpos($datestr, "-");
}
if ($pos !== FALSE) {
if ($pos !== false) {
if (strlen($datestr) == $pos + 5) {
$datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);
}
@ -3322,7 +3322,7 @@ class soap_transport_http extends nusoap_base
* @param boolean $use_curl Whether to try to force cURL use
* @access public
*/
public function soap_transport_http($url, $curl_options = NULL, $use_curl = false)
public function soap_transport_http($url, $curl_options = null, $use_curl = false)
{
parent::nusoap_base();
$this->debug("ctor url=$url use_curl=$use_curl curl_options:");
@ -3690,7 +3690,7 @@ class soap_transport_http extends nusoap_base
* @return string data
* @access public
*/
public function send($data, $timeout=0, $response_timeout=30, $cookies=NULL)
public function send($data, $timeout=0, $response_timeout=30, $cookies=null)
{
$this->debug('entered send() with data of length: '.strlen($data));
@ -3925,7 +3925,7 @@ class soap_transport_http extends nusoap_base
// read chunk-size, chunk-extension (if any) and CRLF
// get the position of the linebreak
$chunkend = strpos($buffer, $lb);
if ($chunkend == FALSE) {
if ($chunkend == false) {
$this->debug('no linebreak found in decodeChunked');
return $new;
}
@ -3938,7 +3938,7 @@ class soap_transport_http extends nusoap_base
$chunkend = strpos($buffer, $lb, $chunkstart + $chunk_size);
// Just in case we got a broken connection
if ($chunkend == FALSE) {
if ($chunkend == false) {
$chunk = substr($buffer, $chunkstart);
// append chunk-data to entity-body
$new .= $chunk;
@ -3956,7 +3956,7 @@ class soap_transport_http extends nusoap_base
$chunkstart = $chunkend + strlen($lb);
$chunkend = strpos($buffer, $lb, $chunkstart) + strlen($lb);
if ($chunkend == FALSE) {
if ($chunkend == false) {
break; //Just in case we got a broken connection
}
$temp = substr($buffer, $chunkstart, $chunkend-$chunkstart);
@ -4024,7 +4024,7 @@ class soap_transport_http extends nusoap_base
* @return boolean true if OK, false if problem
* @access private
*/
public function sendRequest($data, $cookies = NULL)
public function sendRequest($data, $cookies = null)
{
// build cookie string
$cookie_str = $this->getCookiesForRequest($cookies, (($this->scheme == 'ssl') || ($this->scheme == 'https')));
@ -4526,7 +4526,7 @@ class soap_transport_http extends nusoap_base
}
$cookie_param = ';secure;';
if (strpos($cookie_str, $cookie_param) !== FALSE) {
if (strpos($cookie_str, $cookie_param) !== false) {
$secure = true;
} else {
$secure = false;
@ -4838,7 +4838,7 @@ class nusoap_server extends nusoap_base
* @var mixed
* @access public
*/
public $requestHeader = NULL;
public $requestHeader = null;
/**
* SOAP body request portion (incomplete namespace resolution; special characters not escaped) (text)
* @var string
@ -8343,8 +8343,8 @@ class nusoap_parser extends nusoap_base
public $fault_detail = '';
public $depth_array = array();
public $debug_flag = true;
public $soapresponse = NULL; // parsed SOAP Body
public $soapheader = NULL; // parsed SOAP Header
public $soapresponse = null; // parsed SOAP Body
public $soapheader = null; // parsed SOAP Header
public $responseHeaders = ''; // incoming SOAP headers (text)
public $body_position = 0;
// for multiref parsing:
@ -8376,7 +8376,7 @@ class nusoap_parser extends nusoap_base
if (!empty($xml)) {
// Check XML encoding
$pos_xml = strpos($xml, '<?xml');
if ($pos_xml !== FALSE) {
if ($pos_xml !== false) {
$xml_decl = substr($xml, $pos_xml, strpos($xml, '?>', $pos_xml + 2) - $pos_xml + 1);
if (preg_match("/encoding=[\"']([^\"']*)[\"']/", $xml_decl, $res)) {
$xml_encoding = $res[1];
@ -9190,7 +9190,7 @@ class nusoap_client extends nusoap_base
public $certRequest = array(); // Certificate for HTTP SSL authentication
public $requestHeaders = false; // SOAP headers in request (text)
public $responseHeaders = ''; // SOAP headers from response (incomplete namespace resolution) (text)
public $responseHeader = NULL; // SOAP Header from response (parsed)
public $responseHeader = null; // SOAP Header from response (parsed)
public $document = ''; // SOAP body response portion (incomplete namespace resolution) (text)
public $endpoint;
public $forceEndpoint = ''; // overrides WSDL endpoint

View file

@ -299,7 +299,7 @@ r5573 - 2005-06-03 16:32:18 -0700 (Fri, 03 Jun 2005) - bob - checking in chosen
$v_add_path = "";
$v_remove_path = "";
$v_remove_all_path = false;
$v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
$v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
// ----- Look for variable options arguments
$v_size = func_num_args();
@ -457,7 +457,7 @@ r5573 - 2005-06-03 16:32:18 -0700 (Fri, 03 Jun 2005) - bob - checking in chosen
$v_add_path = "";
$v_remove_path = "";
$v_remove_all_path = false;
$v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
$v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
// ----- Look for variable options arguments
$v_size = func_num_args();
@ -695,7 +695,7 @@ r5573 - 2005-06-03 16:32:18 -0700 (Fri, 03 Jun 2005) - bob - checking in chosen
//--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size arguments passed to the method");
// ----- Default values for option
$v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
$v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
// ----- Look for arguments
if ($v_size > 0) {
@ -853,7 +853,7 @@ r5573 - 2005-06-03 16:32:18 -0700 (Fri, 03 Jun 2005) - bob - checking in chosen
//--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "$v_size arguments passed to the method");
// ----- Default values for option
$v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
$v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
// ----- Look for arguments
if ($v_size > 1) {
@ -904,7 +904,7 @@ r5573 - 2005-06-03 16:32:18 -0700 (Fri, 03 Jun 2005) - bob - checking in chosen
$v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
}
if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
$v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
$v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
//--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Option PCLZIP_OPT_EXTRACT_AS_STRING not set.");
} else {
//--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Option PCLZIP_OPT_EXTRACT_AS_STRING set.");
@ -3420,7 +3420,7 @@ r5573 - 2005-06-03 16:32:18 -0700 (Fri, 03 Jun 2005) - bob - checking in chosen
// ----- Decompress the file
$v_file_content = @gzinflate($v_buffer);
unset($v_buffer);
if ($v_file_content === FALSE) {
if ($v_file_content === false) {
//--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unable to inflate compressed file");
// ----- Change the file status
@ -3665,7 +3665,7 @@ r5573 - 2005-06-03 16:32:18 -0700 (Fri, 03 Jun 2005) - bob - checking in chosen
$v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
// ----- Decompress the file
if (($p_string = @gzinflate($v_data)) === FALSE) {
if (($p_string = @gzinflate($v_data)) === false) {
// TBC
}
}

View file

@ -724,8 +724,8 @@ function tln_fixstyle($body, $pos, $trans_image_path, $block_external_images)
break;
}
}
if ($bSucces == FALSE) {
return array(FALSE, strlen($body));
if ($bSucces == false) {
return array(false, strlen($body));
}
@ -883,7 +883,7 @@ function tln_sanitize(
if ($tagname == "style" && $tagtype == 1) {
list($free_content, $curpos) =
tln_fixstyle($body, $gt+1, $trans_image_path, $block_external_images);
if ($free_content != FALSE) {
if ($free_content != false) {
if (!empty($attary)) {
$attary = tln_fixatts($tagname,
$attary,

View file

@ -15,7 +15,7 @@ class OAuthConsumer
public $key;
public $secret;
public function __construct($key, $secret, $callback_url = NULL)
public function __construct($key, $secret, $callback_url = null)
{
$this->key = $key;
$this->secret = $secret;
@ -251,7 +251,7 @@ class OAuthRequest
public static $version = '1.0';
public static $POST_INPUT = 'php://input';
public function __construct($http_method, $http_url, $parameters = NULL)
public function __construct($http_method, $http_url, $parameters = null)
{
@$parameters or $parameters = array();
$parameters = array_merge(OAuthUtil::parse_parameters(parse_url($http_url, PHP_URL_QUERY)), $parameters);
@ -264,7 +264,7 @@ class OAuthRequest
/**
* attempt to build up a request from what was passed to the server
*/
public static function from_request($http_method = NULL, $http_url = NULL, $parameters = NULL)
public static function from_request($http_method = null, $http_url = null, $parameters = null)
{
$scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on")
? 'http'
@ -315,7 +315,7 @@ class OAuthRequest
/**
* pretty much a helper function to set up the request
*/
public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters = NULL)
public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters = null)
{
@$parameters or $parameters = array();
$defaults = array("oauth_version" => OAuthRequest::$version,
@ -558,7 +558,7 @@ class OAuthServer
$consumer = $this->get_consumer($request);
// no token required for the initial token request
$token = NULL;
$token = null;
$this->check_signature($request, $consumer, $token);
@ -847,7 +847,7 @@ class OAuthUtil
// returns the headers in the same case as they are in the
// request
$out = array();
foreach ($headers AS $key => $value) {
foreach ($headers as $key => $value) {
$key = str_replace(
" ",
"-",

View file

@ -25,11 +25,11 @@ class TwitterOAuth
/* Set connect timeout. */
public $connecttimeout = 30;
/* Verify SSL Cert. */
public $ssl_verifypeer = FALSE;
public $ssl_verifypeer = false;
/* Respons format. */
public $format = 'json';
/* Decode returned json data. */
public $decode_json = TRUE;
public $decode_json = true;
/* Contains the last HTTP headers returned. */
public $http_info;
/* Set the useragnet. */
@ -75,14 +75,14 @@ class TwitterOAuth
/**
* construct TwitterOAuth object
*/
public function __construct($consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL)
public function __construct($consumer_key, $consumer_secret, $oauth_token = null, $oauth_token_secret = null)
{
$this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
if (!empty($oauth_token) && !empty($oauth_token_secret)) {
$this->token = new OAuthConsumer($oauth_token, $oauth_token_secret);
} else {
$this->token = NULL;
$this->token = null;
}
}
@ -107,7 +107,7 @@ class TwitterOAuth
*
* @returns a string
*/
public function getAuthorizeURL($token, $sign_in_with_twitter = TRUE)
public function getAuthorizeURL($token, $sign_in_with_twitter = true)
{
if (is_array($token)) {
$token = $token['oauth_token'];
@ -218,7 +218,7 @@ class TwitterOAuth
*
* @return API results
*/
public function http($url, $method, $postfields = NULL)
public function http($url, $method, $postfields = null)
{
$this->http_info = array();
$ci = curl_init();
@ -226,15 +226,15 @@ class TwitterOAuth
curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent);
curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout);
curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout);
curl_setopt($ci, CURLOPT_RETURNTRANSFER, TRUE);
curl_setopt($ci, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ci, CURLOPT_HTTPHEADER, array('Expect:'));
curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer);
curl_setopt($ci, CURLOPT_HEADERFUNCTION, array($this, 'getHeader'));
curl_setopt($ci, CURLOPT_HEADER, FALSE);
curl_setopt($ci, CURLOPT_HEADER, false);
switch ($method) {
case 'POST':
curl_setopt($ci, CURLOPT_POST, TRUE);
curl_setopt($ci, CURLOPT_POST, true);
if (!empty($postfields)) {
curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields);
}

View file

@ -742,7 +742,7 @@ class TCPDFBarcode
$k = 0;
for ($i = 0; $i < $len; ++$i) {
$w += 1;
if (($i == ($len - 1)) OR (($i < ($len - 1)) AND ($seq{$i} != $seq{($i+1)}))) {
if (($i == ($len - 1)) or (($i < ($len - 1)) and ($seq{$i} != $seq{($i+1)}))) {
if ($seq{$i} == '1') {
$t = true; // bar
} else {
@ -797,7 +797,7 @@ class TCPDFBarcode
for ($i = 0; $i < $clen; $i = ($i + 2)) {
$char_bar = $code{$i};
$char_space = $code{$i+1};
if ((!isset($chr[$char_bar])) OR (!isset($chr[$char_space]))) {
if ((!isset($chr[$char_bar])) or (!isset($chr[$char_space]))) {
// invalid character
return false;
}
@ -994,10 +994,10 @@ class TCPDFBarcode
$len = strlen($code);
for ($i = 0; $i < $len; ++$i) {
$ck = strpos($keys, $code{$i});
if (($i == 0) OR ($i > ($len-4))) {
if (($i == 0) or ($i > ($len-4))) {
$char_num = ord($code{$i});
$seq = $chr[$char_num];
} elseif (($ck >= 0) AND isset($chr[$ck])) {
} elseif (($ck >= 0) and isset($chr[$ck])) {
$seq = $chr[$ck];
} else {
// invalid character
@ -1073,7 +1073,7 @@ class TCPDFBarcode
if ($upce) {
// convert UPC-A to UPC-E
$tmp = substr($code, 4, 3);
if (($tmp == '000') OR ($tmp == '100') OR ($tmp == '200')) {
if (($tmp == '000') or ($tmp == '100') or ($tmp == '200')) {
// manufacturer code ends in 000, 100, or 200
$upce_code = substr($code, 2, 2).substr($code, 9, 3).substr($code, 4, 1);
} else {
@ -1198,7 +1198,7 @@ class TCPDFBarcode
$w = 0;
for ($i = 0; $i < $clen; ++$i) {
$w += 1;
if (($i == ($clen - 1)) OR (($i < ($clen - 1)) AND ($seq{$i} != $seq{($i+1)}))) {
if (($i == ($clen - 1)) or (($i < ($clen - 1)) and ($seq{$i} != $seq{($i+1)}))) {
if ($seq{$i} == '1') {
$t = true; // bar
} else {
@ -1302,30 +1302,30 @@ class TCPDFBarcode
{
// bar lenght
if ($planet) {
$barlen = Array(
0 => Array(1,1,2,2,2),
1 => Array(2,2,2,1,1),
2 => Array(2,2,1,2,1),
3 => Array(2,2,1,1,2),
4 => Array(2,1,2,2,1),
5 => Array(2,1,2,1,2),
6 => Array(2,1,1,2,2),
7 => Array(1,2,2,2,1),
8 => Array(1,2,2,1,2),
9 => Array(1,2,1,2,2)
$barlen = array(
0 => array(1,1,2,2,2),
1 => array(2,2,2,1,1),
2 => array(2,2,1,2,1),
3 => array(2,2,1,1,2),
4 => array(2,1,2,2,1),
5 => array(2,1,2,1,2),
6 => array(2,1,1,2,2),
7 => array(1,2,2,2,1),
8 => array(1,2,2,1,2),
9 => array(1,2,1,2,2)
);
} else {
$barlen = Array(
0 => Array(2,2,1,1,1),
1 => Array(1,1,1,2,2),
2 => Array(1,1,2,1,2),
3 => Array(1,1,2,2,1),
4 => Array(1,2,1,1,2),
5 => Array(1,2,1,2,1),
6 => Array(1,2,2,1,1),
7 => Array(2,1,1,1,2),
8 => Array(2,1,1,2,1),
9 => Array(2,1,2,1,1)
$barlen = array(
0 => array(2,2,1,1,1),
1 => array(1,1,1,2,2),
2 => array(1,1,2,1,2),
3 => array(1,1,2,2,1),
4 => array(1,2,1,1,2),
5 => array(1,2,1,2,1),
6 => array(1,2,2,1,1),
7 => array(2,1,1,1,2),
8 => array(2,1,1,2,1),
9 => array(2,1,2,1,1)
);
}
$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 2, 'bcode' => array());
@ -1858,7 +1858,7 @@ class TCPDFBarcode
for ($i = 0; $i < 65; ++$i) {
$asc = (($characters[$asc_chr[$i]] & pow(2, $asc_pos[$i])) > 0);
$dsc = (($characters[$dsc_chr[$i]] & pow(2, $dsc_pos[$i])) > 0);
if ($asc AND $dsc) {
if ($asc and $dsc) {
// full bar (F)
$p = 0;
$h = 3;

View file

@ -56,7 +56,7 @@ r46451 - 2009-04-23 16:57:40 -0700 (Thu, 23 Apr 2009) - jenny - tcpdf initial ch
// ENGLISH
global $l;
$l = Array();
$l = array();
// PAGE META DESCRIPTORS --------------------------------------

View file

@ -56,7 +56,7 @@ r46451 - 2009-04-23 16:57:40 -0700 (Thu, 23 Apr 2009) - jenny - tcpdf initial ch
// ENGLISH
global $l;
$l = Array();
$l = array();
// PAGE META DESCRIPTORS --------------------------------------

View file

@ -60,7 +60,7 @@ r46451 - 2009-04-23 16:57:40 -0700 (Thu, 23 Apr 2009) - jenny - tcpdf initial ch
if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {
// DOCUMENT_ROOT fix for IIS Webserver
if ((!isset($_SERVER['DOCUMENT_ROOT'])) OR (empty($_SERVER['DOCUMENT_ROOT']))) {
if ((!isset($_SERVER['DOCUMENT_ROOT'])) or (empty($_SERVER['DOCUMENT_ROOT']))) {
if (isset($_SERVER['SCRIPT_FILENAME'])) {
$_SERVER['DOCUMENT_ROOT'] = str_replace('\\', '/', substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF'])));
} elseif (isset($_SERVER['PATH_TRANSLATED'])) {
@ -84,8 +84,8 @@ if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {
define ('K_PATH_MAIN', $k_path_main);
// Automatic calculation for the following K_PATH_URL constant
if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) {
if (isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND strtolower($_SERVER['HTTPS'])!='off') {
if (isset($_SERVER['HTTP_HOST']) and (!empty($_SERVER['HTTP_HOST']))) {
if (isset($_SERVER['HTTPS']) and (!empty($_SERVER['HTTPS'])) and strtolower($_SERVER['HTTPS'])!='off') {
$k_path_url = 'https://';
} else {
$k_path_url = 'http://';

View file

@ -56,7 +56,7 @@ r46451 - 2009-04-23 16:57:40 -0700 (Thu, 23 Apr 2009) - jenny - tcpdf initial ch
*/
// DOCUMENT_ROOT fix for IIS Webserver
if ((!isset($_SERVER['DOCUMENT_ROOT'])) OR (empty($_SERVER['DOCUMENT_ROOT']))) {
if ((!isset($_SERVER['DOCUMENT_ROOT'])) or (empty($_SERVER['DOCUMENT_ROOT']))) {
if (isset($_SERVER['SCRIPT_FILENAME'])) {
$_SERVER['DOCUMENT_ROOT'] = str_replace('\\', '/', substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF'])));
} elseif (isset($_SERVER['PATH_TRANSLATED'])) {
@ -80,8 +80,8 @@ if (substr($k_path_main, -1) != '/') {
define ('K_PATH_MAIN', $k_path_main);
// Automatic calculation for the following K_PATH_URL constant
if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) {
if (isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND strtolower($_SERVER['HTTPS'])!='off') {
if (isset($_SERVER['HTTP_HOST']) and (!empty($_SERVER['HTTP_HOST']))) {
if (isset($_SERVER['HTTPS']) and (!empty($_SERVER['HTTPS'])) and strtolower($_SERVER['HTTPS'])!='off') {
$k_path_url = 'https://';
} else {
$k_path_url = 'http://';

View file

@ -102,7 +102,7 @@ function MakeFont($fontfile, $fmfile, $embedded=true, $enc='cp1252', $patch=arra
$ffext = strtolower(substr($fontfile, -3));
$fmext = strtolower(substr($fmfile, -3));
if ($fmext == 'afm') {
if (($ffext == 'ttf') OR ($ffext == 'otf')) {
if (($ffext == 'ttf') or ($ffext == 'otf')) {
$type = 'TrueType';
} elseif ($ffext == 'pfb') {
$type = 'Type1';
@ -125,7 +125,7 @@ function MakeFont($fontfile, $fmfile, $embedded=true, $enc='cp1252', $patch=arra
$fd = MakeFontDescriptor($fm, empty($map));
} elseif ($fmext == 'ufm') {
$enc = '';
if (($ffext == 'ttf') OR ($ffext == 'otf')) {
if (($ffext == 'ttf') or ($ffext == 'otf')) {
$type = 'TrueTypeUnicode';
} else {
die('Error: not a TrueType font: '.$ffext);
@ -179,7 +179,7 @@ r47930 - 2009-06-02 16:21:39 -0700 (Tue, 02 Jun 2009) - jenny - Updating with ch
$s .= '$up='.$fm['UnderlinePosition'].";\n";
$s .= '$ut='.$fm['UnderlineThickness'].";\n";
if ($dw <= 0) {
if (isset($fm['Widths'][32]) AND ($fm['Widths'][32] > 0)) {
if (isset($fm['Widths'][32]) and ($fm['Widths'][32] > 0)) {
// assign default space width
$dw = $fm['Widths'][32];
} else {
@ -211,7 +211,7 @@ r47930 - 2009-06-02 16:21:39 -0700 (Tue, 02 Jun 2009) - jenny - Updating with ch
// END SUGARCRM SPECIFIC
if ($embedded) {
//Embedded font
if (($type == 'TrueType') OR ($type == 'TrueTypeUnicode')) {
if (($type == 'TrueType') or ($type == 'TrueTypeUnicode')) {
CheckTTF($fontfile);
}
$f = fopen($fontfile, 'rb');
@ -232,7 +232,7 @@ r47930 - 2009-06-02 16:21:39 -0700 (Tue, 02 Jun 2009) - jenny - Updating with ch
die('Error: font file does not seem to be valid Type1');
}
$size1 = $pos + 6;
if ($header AND (ord($file{$size1}) == 128)) {
if ($header and (ord($file{$size1}) == 128)) {
//Strip second binary header
$file = substr($file, 0, $size1).substr($file, $size1+6);
}
@ -383,12 +383,12 @@ function ReadUFM($file, &$cidtogidmap)
$fm['CapXHeight'] = $e[13];
}
// Set GID
if (($cc >= 0) AND ($cc < 0xFFFF) AND $glyph) {
if (($cc >= 0) and ($cc < 0xFFFF) and $glyph) {
$cidtogidmap{($cc * 2)} = chr($glyph >> 8);
$cidtogidmap{(($cc * 2) + 1)} = chr($glyph & 0xFF);
}
}
if (($gn == '.notdef') AND (!isset($fm['MissingWidth']))) {
if (($gn == '.notdef') and (!isset($fm['MissingWidth']))) {
$fm['MissingWidth'] = $w;
}
} elseif ($code == 'FontName') {
@ -538,7 +538,7 @@ function ReadAFM($file, &$map)
if (!isset($widths['.notdef'])) {
$widths['.notdef'] = 600;
}
if (!isset($widths['Delta']) AND isset($widths['increment'])) {
if (!isset($widths['Delta']) and isset($widths['increment'])) {
$widths['Delta'] = $widths['increment'];
}
//Order widths according to map
@ -574,7 +574,7 @@ function MakeFontDescriptor($fm, $symbolic=false)
$fd .= ",'CapHeight'=>".$ch;
//Flags
$flags = 0;
if (isset($fm['IsFixedPitch']) AND $fm['IsFixedPitch']) {
if (isset($fm['IsFixedPitch']) and $fm['IsFixedPitch']) {
$flags += 1<<0;
}
if ($symbolic) {
@ -582,7 +582,7 @@ function MakeFontDescriptor($fm, $symbolic=false)
} else {
$flags += 1<<5;
}
if (isset($fm['ItalicAngle']) AND ($fm['ItalicAngle'] != 0)) {
if (isset($fm['ItalicAngle']) and ($fm['ItalicAngle'] != 0)) {
$flags += 1<<6;
}
$fd .= ",'Flags'=>".$flags;
@ -704,7 +704,7 @@ function CheckTTF($file)
$pp = ($fsType & 0x04) != 0;
$e = ($fsType & 0x08) != 0;
fclose($f);
if ($rl AND (!$pp) AND (!$e)) {
if ($rl and (!$pp) and (!$e)) {
print "Warning: font license does not allow embedding\n";
}
}

File diff suppressed because it is too large Load diff

View file

@ -58,7 +58,7 @@ if (!defined('sugarEntry') || !sugarEntry) {
continue;
}
if ($bean->field_name_map[strtolower($i)]['type'] == 'datetime' OR $bean->field_name_map[strtolower($i)]['type'] == 'datetimecombo') {
if ($bean->field_name_map[strtolower($i)]['type'] == 'datetime' or $bean->field_name_map[strtolower($i)]['type'] == 'datetimecombo') {
$db_date = $timedate->fromUser($f);
$db_date_format = $db_date->format('Y-m-d H:i:s');
$fields['DB_'.$i] = $db_date_format;

View file

@ -211,7 +211,7 @@ function object_to_array_recursive($obj)
function array_merge_values($arr1, $arr2)
{
if (count($arr1) != count($arr2)) {
return FALSE;
return false;
}
for ($i = 0; $i < count($arr1); $i++) {
@ -230,13 +230,13 @@ function array_merge_values($arr1, $arr2)
function array_search_insensitive($key, $haystack)
{
if (!is_array($haystack)) {
return FALSE;
return false;
}
$found = FALSE;
$found = false;
foreach ($haystack as $k => $v) {
if (strtolower($v) == strtolower($key)) {
$found = TRUE;
$found = true;
break;
}
}

View file

@ -63,7 +63,7 @@ function unzip_file($zip_archive, $archive_file, $zip_dir)
$res = $zip->open(UploadFile::realpath($zip_archive)); // we need realpath here for PHP streams support
if ($res !== TRUE) {
if ($res !== true) {
if (defined('SUITE_PHPUNIT_RUNNER') || defined('SUGARCRM_INSTALL')) {
$GLOBALS['log']->fatal(sprintf("ZIP Error(%d): Status(%s): Arhive(%s): Directory(%s)", $res, $zip->status, $zip_archive, $zip_dir));
return false;
@ -78,7 +78,7 @@ function unzip_file($zip_archive, $archive_file, $zip_dir)
$res = $zip->extractTo(UploadFile::realpath($zip_dir));
}
if ($res !== TRUE) {
if ($res !== true) {
if (defined('SUITE_PHPUNIT_RUNNER') || defined('SUGARCRM_INSTALL')) {
$GLOBALS['log']->fatal(sprintf("ZIP Error(%d): Status(%s): Arhive(%s): Directory(%s)", $res, $zip->status, $zip_archive, $zip_dir));
return false;
@ -131,9 +131,9 @@ function zip_files_list($zip_file, $file_list, $prefix = '')
{
$archive = new ZipArchive();
$res = $archive->open(UploadFile::realpath($zip_file), ZipArchive::CREATE|ZipArchive::OVERWRITE); // we need realpath here for PHP streams support
if ($res !== TRUE) {
if ($res !== true) {
$GLOBALS['log']->fatal("Unable to open zip file, check directory permissions: $zip_file");
return FALSE;
return false;
}
foreach ($file_list as $file) {
if (!empty($prefix) && preg_match($prefix, $file, $matches) > 0) {
@ -143,5 +143,5 @@ function zip_files_list($zip_file, $file_list, $prefix = '')
}
$archive->addFile($file, $zipname);
}
return TRUE;
return true;
}

View file

@ -157,7 +157,7 @@ class TeamDemoData
*/
public function _seed_data_get_teamset_list()
{
$teamsets = Array();
$teamsets = array();
$teamsets[] = array("East", "West");
$teamsets[] = array("East", "West", "1");
$teamsets[] = array("West", "East");
@ -173,7 +173,7 @@ class TeamDemoData
*/
public function _seed_data_get_team_list()
{
$teams = Array();
$teams = array();
//bug 28138 todo
$teams[] = "north";
$teams[] = "south";

View file

@ -145,7 +145,7 @@ class UserDemoData
*/
public function _seed_data_get_user_list()
{
$users = Array();
$users = array();
//bug 28138 todo
$users[] = "north";
$users[] = "south";

View file

@ -1865,8 +1865,8 @@ if (is_file("config.php")) {
}
if (!empty($sugar_config['languages'])) {
// We need to encode the languages in a way that can be retrieved later.
$language_keys = Array();
$language_values = Array();
$language_keys = array();
$language_values = array();
foreach ($sugar_config['languages'] as $key=>$value) {
$language_keys[] = $key;

View file

@ -112,9 +112,9 @@ if ($large_scale_test) {
$possible_duration_hours_arr = array( 0, 1, 2, 3);
$possible_duration_minutes_arr = array('00' => '00','15' => '15', '30' => '30', '45' => '45');
$account_ids = Array();
$accounts = Array();
$opportunity_ids = Array();
$account_ids = array();
$accounts = array();
$opportunity_ids = array();
// Determine the assigned user for all demo data. This is the default user if set, or admin
$assigned_user_name = "admin";

View file

@ -81,8 +81,8 @@ if (is_file("config.php")) {
}
if (!empty($sugar_config['languages'])) {
// We need to encode the languages in a way that can be retrieved later.
$language_keys = Array();
$language_values = Array();
$language_keys = array();
$language_values = array();
foreach ($sugar_config['languages'] as $key=>$value) {
$language_keys[] = $key;

View file

@ -81,8 +81,8 @@ if (is_file("config.php")) {
}
if (!empty($sugar_config['languages'])) {
// We need to encode the languages in a way that can be retrieved later.
$language_keys = Array();
$language_values = Array();
$language_keys = array();
$language_values = array();
foreach ($sugar_config['languages'] as $key=>$value) {
$language_keys[] = $key;

View file

@ -279,7 +279,7 @@ function getCustomFields()
'id' => 'Accountsjjwg_maps_lng_c',
'name' => 'jjwg_maps_lng_c',
'label' => 'LBL_JJWG_MAPS_LNG',
'comments' => NULL,
'comments' => null,
'help' => 'Longitude',
'module' => 'Accounts',
'type' => 'float',
@ -301,7 +301,7 @@ function getCustomFields()
'id' => 'Accountsjjwg_maps_lat_c',
'name' => 'jjwg_maps_lat_c',
'label' => 'LBL_JJWG_MAPS_LAT',
'comments' => NULL,
'comments' => null,
'help' => 'Latitude',
'module' => 'Accounts',
'type' => 'float',
@ -329,15 +329,15 @@ function getCustomFields()
'type' => 'varchar',
'max_size' => '255',
'require_option' => '0',
'default' => NULL,
'default_value' => NULL,
'default' => null,
'default_value' => null,
'date_modified' => '2010-09-18 22:06:01',
'audited' => '0',
'mass_update' => '0',
'duplicate_merge' => '0',
'reportable' => '1',
'importable' => 'true',
'ext1' => NULL,
'ext1' => null,
),
'Accountsjjwg_maps_address_c' =>
array(
@ -350,22 +350,22 @@ function getCustomFields()
'type' => 'varchar',
'max_size' => '255',
'require_option' => '0',
'default' => NULL,
'default_value' => NULL,
'default' => null,
'default_value' => null,
'date_modified' => '2010-09-18 22:06:01',
'audited' => '0',
'mass_update' => '0',
'duplicate_merge' => '0',
'reportable' => '1',
'importable' => 'true',
'ext1' => NULL,
'ext1' => null,
),
'Casesjjwg_maps_lng_c' =>
array(
'id' => 'Casesjjwg_maps_lng_c',
'name' => 'jjwg_maps_lng_c',
'label' => 'LBL_JJWG_MAPS_LNG',
'comments' => NULL,
'comments' => null,
'help' => 'Longitude',
'module' => 'Cases',
'type' => 'float',
@ -387,7 +387,7 @@ function getCustomFields()
'id' => 'Casesjjwg_maps_lat_c',
'name' => 'jjwg_maps_lat_c',
'label' => 'LBL_JJWG_MAPS_LAT',
'comments' => NULL,
'comments' => null,
'help' => 'Latitude',
'module' => 'Cases',
'type' => 'float',
@ -415,15 +415,15 @@ function getCustomFields()
'type' => 'varchar',
'max_size' => '255',
'require_option' => '0',
'default' => NULL,
'default_value' => NULL,
'default' => null,
'default_value' => null,
'date_modified' => '2010-09-18 22:06:01',
'audited' => '0',
'mass_update' => '0',
'duplicate_merge' => '0',
'reportable' => '1',
'importable' => 'true',
'ext1' => NULL,
'ext1' => null,
),
'Casesjjwg_maps_address_c' =>
array(
@ -436,22 +436,22 @@ function getCustomFields()
'type' => 'varchar',
'max_size' => '255',
'require_option' => '0',
'default' => NULL,
'default_value' => NULL,
'default' => null,
'default_value' => null,
'date_modified' => '2010-09-18 22:06:01',
'audited' => '0',
'mass_update' => '0',
'duplicate_merge' => '0',
'reportable' => '1',
'importable' => 'true',
'ext1' => NULL,
'ext1' => null,
),
'Contactsjjwg_maps_lng_c' =>
array(
'id' => 'Contactsjjwg_maps_lng_c',
'name' => 'jjwg_maps_lng_c',
'label' => 'LBL_JJWG_MAPS_LNG',
'comments' => NULL,
'comments' => null,
'help' => 'Longitude',
'module' => 'Contacts',
'type' => 'float',
@ -473,7 +473,7 @@ function getCustomFields()
'id' => 'Contactsjjwg_maps_lat_c',
'name' => 'jjwg_maps_lat_c',
'label' => 'LBL_JJWG_MAPS_LAT',
'comments' => NULL,
'comments' => null,
'help' => 'Latitude',
'module' => 'Contacts',
'type' => 'float',
@ -501,15 +501,15 @@ function getCustomFields()
'type' => 'varchar',
'max_size' => '255',
'require_option' => '0',
'default' => NULL,
'default_value' => NULL,
'default' => null,
'default_value' => null,
'date_modified' => '2010-09-18 22:06:01',
'audited' => '0',
'mass_update' => '0',
'duplicate_merge' => '0',
'reportable' => '1',
'importable' => 'true',
'ext1' => NULL,
'ext1' => null,
),
'Contactsjjwg_maps_address_c' =>
array(
@ -522,22 +522,22 @@ function getCustomFields()
'type' => 'varchar',
'max_size' => '255',
'require_option' => '0',
'default' => NULL,
'default_value' => NULL,
'default' => null,
'default_value' => null,
'date_modified' => '2010-09-18 22:06:01',
'audited' => '0',
'mass_update' => '0',
'duplicate_merge' => '0',
'reportable' => '1',
'importable' => 'true',
'ext1' => NULL,
'ext1' => null,
),
'Leadsjjwg_maps_lng_c' =>
array(
'id' => 'Leadsjjwg_maps_lng_c',
'name' => 'jjwg_maps_lng_c',
'label' => 'LBL_JJWG_MAPS_LNG',
'comments' => NULL,
'comments' => null,
'help' => 'Longitude',
'module' => 'Leads',
'type' => 'float',
@ -559,7 +559,7 @@ function getCustomFields()
'id' => 'Leadsjjwg_maps_lat_c',
'name' => 'jjwg_maps_lat_c',
'label' => 'LBL_JJWG_MAPS_LAT',
'comments' => NULL,
'comments' => null,
'help' => 'Latitude',
'module' => 'Leads',
'type' => 'float',
@ -587,15 +587,15 @@ function getCustomFields()
'type' => 'varchar',
'max_size' => '255',
'require_option' => '0',
'default' => NULL,
'default_value' => NULL,
'default' => null,
'default_value' => null,
'date_modified' => '2010-09-18 22:06:01',
'audited' => '0',
'mass_update' => '0',
'duplicate_merge' => '0',
'reportable' => '1',
'importable' => 'true',
'ext1' => NULL,
'ext1' => null,
),
'Leadsjjwg_maps_address_c' =>
array(
@ -608,22 +608,22 @@ function getCustomFields()
'type' => 'varchar',
'max_size' => '255',
'require_option' => '0',
'default' => NULL,
'default_value' => NULL,
'default' => null,
'default_value' => null,
'date_modified' => '2010-09-18 22:06:01',
'audited' => '0',
'mass_update' => '0',
'duplicate_merge' => '0',
'reportable' => '1',
'importable' => 'true',
'ext1' => NULL,
'ext1' => null,
),
'Meetingsjjwg_maps_lng_c' =>
array(
'id' => 'Meetingsjjwg_maps_lng_c',
'name' => 'jjwg_maps_lng_c',
'label' => 'LBL_JJWG_MAPS_LNG',
'comments' => NULL,
'comments' => null,
'help' => 'Longitude',
'module' => 'Meetings',
'type' => 'float',
@ -645,7 +645,7 @@ function getCustomFields()
'id' => 'Meetingsjjwg_maps_lat_c',
'name' => 'jjwg_maps_lat_c',
'label' => 'LBL_JJWG_MAPS_LAT',
'comments' => NULL,
'comments' => null,
'help' => 'Latitude',
'module' => 'Meetings',
'type' => 'float',
@ -673,7 +673,7 @@ function getCustomFields()
'type' => 'varchar',
'max_size' => '255',
'require_option' => '0',
'default_value' => NULL,
'default_value' => null,
'date_modified' => '2012-08-17 22:06:01',
'deleted' => '0',
'audited' => '0',
@ -681,7 +681,7 @@ function getCustomFields()
'duplicate_merge' => '0',
'reportable' => '1',
'importable' => 'true',
'ext1' => NULL,
'ext1' => null,
),
'Meetingsjjwg_maps_address_c' =>
array(
@ -694,22 +694,22 @@ function getCustomFields()
'type' => 'varchar',
'max_size' => '255',
'require_option' => '0',
'default' => NULL,
'default_value' => NULL,
'default' => null,
'default_value' => null,
'date_modified' => '2012-08-17 22:06:01',
'audited' => '0',
'mass_update' => '0',
'duplicate_merge' => '0',
'reportable' => '1',
'importable' => 'true',
'ext1' => NULL,
'ext1' => null,
),
'Opportunitiesjjwg_maps_lng_c' =>
array(
'id' => 'Opportunitiesjjwg_maps_lng_c',
'name' => 'jjwg_maps_lng_c',
'label' => 'LBL_JJWG_MAPS_LNG',
'comments' => NULL,
'comments' => null,
'help' => 'Longitude',
'module' => 'Opportunities',
'type' => 'float',
@ -731,7 +731,7 @@ function getCustomFields()
'id' => 'Opportunitiesjjwg_maps_lat_c',
'name' => 'jjwg_maps_lat_c',
'label' => 'LBL_JJWG_MAPS_LAT',
'comments' => NULL,
'comments' => null,
'help' => 'Latitude',
'module' => 'Opportunities',
'type' => 'float',
@ -759,15 +759,15 @@ function getCustomFields()
'type' => 'varchar',
'max_size' => '255',
'require_option' => '0',
'default' => NULL,
'default_value' => NULL,
'default' => null,
'default_value' => null,
'date_modified' => '2010-09-18 22:06:01',
'audited' => '0',
'mass_update' => '0',
'duplicate_merge' => '0',
'reportable' => '1',
'importable' => 'true',
'ext1' => NULL,
'ext1' => null,
),
'Opportunitiesjjwg_maps_address_c' =>
array(
@ -780,22 +780,22 @@ function getCustomFields()
'type' => 'varchar',
'max_size' => '255',
'require_option' => '0',
'default' => NULL,
'default_value' => NULL,
'default' => null,
'default_value' => null,
'date_modified' => '2010-09-18 22:06:01',
'audited' => '0',
'mass_update' => '0',
'duplicate_merge' => '0',
'reportable' => '1',
'importable' => 'true',
'ext1' => NULL,
'ext1' => null,
),
'Projectjjwg_maps_lng_c' =>
array(
'id' => 'Projectjjwg_maps_lng_c',
'name' => 'jjwg_maps_lng_c',
'label' => 'LBL_JJWG_MAPS_LNG',
'comments' => NULL,
'comments' => null,
'help' => 'Longitude',
'module' => 'Project',
'type' => 'float',
@ -817,7 +817,7 @@ function getCustomFields()
'id' => 'Projectjjwg_maps_lat_c',
'name' => 'jjwg_maps_lat_c',
'label' => 'LBL_JJWG_MAPS_LAT',
'comments' => NULL,
'comments' => null,
'help' => 'Latitude',
'module' => 'Project',
'type' => 'float',
@ -845,15 +845,15 @@ function getCustomFields()
'type' => 'varchar',
'max_size' => '255',
'require_option' => '0',
'default' => NULL,
'default_value' => NULL,
'default' => null,
'default_value' => null,
'date_modified' => '2010-09-18 22:06:01',
'audited' => '0',
'mass_update' => '0',
'duplicate_merge' => '0',
'reportable' => '1',
'importable' => 'true',
'ext1' => NULL,
'ext1' => null,
),
'Projectjjwg_maps_address_c' =>
array(
@ -866,22 +866,22 @@ function getCustomFields()
'type' => 'varchar',
'max_size' => '255',
'require_option' => '0',
'default' => NULL,
'default_value' => NULL,
'default' => null,
'default_value' => null,
'date_modified' => '2010-09-18 22:06:01',
'audited' => '0',
'mass_update' => '0',
'duplicate_merge' => '0',
'reportable' => '1',
'importable' => 'true',
'ext1' => NULL,
'ext1' => null,
),
'Prospectsjjwg_maps_lng_c' =>
array(
'id' => 'Prospectsjjwg_maps_lng_c',
'name' => 'jjwg_maps_lng_c',
'label' => 'LBL_JJWG_MAPS_LNG',
'comments' => NULL,
'comments' => null,
'help' => 'Longitude',
'module' => 'Prospects',
'type' => 'float',
@ -903,7 +903,7 @@ function getCustomFields()
'id' => 'Prospectsjjwg_maps_lat_c',
'name' => 'jjwg_maps_lat_c',
'label' => 'LBL_JJWG_MAPS_LAT',
'comments' => NULL,
'comments' => null,
'help' => 'Latitude',
'module' => 'Prospects',
'type' => 'float',
@ -931,15 +931,15 @@ function getCustomFields()
'type' => 'varchar',
'max_size' => '255',
'require_option' => '0',
'default' => NULL,
'default_value' => NULL,
'default' => null,
'default_value' => null,
'date_modified' => '2012-08-17 22:06:01',
'audited' => '0',
'mass_update' => '0',
'duplicate_merge' => '0',
'reportable' => '1',
'importable' => 'true',
'ext1' => NULL,
'ext1' => null,
),
'Prospectsjjwg_maps_address_c' =>
array(
@ -952,15 +952,15 @@ function getCustomFields()
'type' => 'varchar',
'max_size' => '255',
'require_option' => '0',
'default' => NULL,
'default_value' => NULL,
'default' => null,
'default_value' => null,
'date_modified' => '2012-08-17 22:06:01',
'audited' => '0',
'mass_update' => '0',
'duplicate_merge' => '0',
'reportable' => '1',
'importable' => 'true',
'ext1' => NULL,
'ext1' => null,
),
);

View file

@ -1,6 +1,6 @@
<?php
global $app_strings;
if ($app_strings === NULL) {
if ($app_strings === null) {
$app_strings = return_application_language($current_language);
}

View file

@ -106,11 +106,11 @@ if (!defined('sugarEntry') || !sugarEntry) {
//process each group array
foreach ($fg as $loc=>$trgt) {
$already_minified = FALSE;
$already_minified = false;
$minified_loc = str_replace('.js', '-min.js', $loc);
if (is_file($minified_loc)) {
$loc = $minified_loc;
$already_minified = TRUE;
$already_minified = true;
}
$relpath = $loc;
$loc = $from_path.'/'.$loc;
@ -323,7 +323,7 @@ if (!defined('sugarEntry') || !sugarEntry) {
//minify javascript
//$jMin = new JSMin($from_path,$to_path,$lic_arr);
$min_file = str_replace('.js', '-min.js', $from_path);
if (strpos($from_path, '-min.js') !== FALSE) {
if (strpos($from_path, '-min.js') !== false) {
$min_file = $from_path;
}

View file

@ -435,7 +435,7 @@ class SuiteBeanResource extends Resource
{
$sugarBeanResource = clone $this;
$objValues = get_object_vars($resource); // return array of object values
foreach ($objValues AS $key => $value) {
foreach ($objValues as $key => $value) {
$sugarBeanResource->$key = $value;
}

View file

@ -46,7 +46,7 @@ class OperatingSystem
*/
public function isOsBSD()
{
return stristr(php_uname('s'), 'BSD') !== FALSE;
return stristr(php_uname('s'), 'BSD') !== false;
}
/**
@ -54,7 +54,7 @@ class OperatingSystem
*/
public function isOsLinux()
{
return stristr(php_uname('s'), 'Linux') !== FALSE;
return stristr(php_uname('s'), 'Linux') !== false;
}
/**
@ -62,7 +62,7 @@ class OperatingSystem
*/
public function isOsMacOSX()
{
return stristr(php_uname('s'), 'Darwin') !== FALSE;
return stristr(php_uname('s'), 'Darwin') !== false;
}
/**
@ -70,7 +70,7 @@ class OperatingSystem
*/
public function isOsSolaris()
{
return stristr(php_uname('s'), 'Solaris') !== FALSE;
return stristr(php_uname('s'), 'Solaris') !== false;
}
/**
@ -86,7 +86,7 @@ class OperatingSystem
*/
public function isOsWindows()
{
return stristr(php_uname('s'), 'Windows') !== FALSE;
return stristr(php_uname('s'), 'Windows') !== false;
}
/**

View file

@ -65,7 +65,7 @@ $dictionary['folders'] = array(
'name' => 'folder_type',
'type' => 'varchar',
'len' => 25,
'default' => NULL,
'default' => null,
),
array(
'name' => 'parent_folder',

View file

@ -41,8 +41,8 @@ if (!defined('sugarEntry') || !sugarEntry) {
********************************************************************************/
global $mod_strings;
$module_menu = Array(
Array("index.php?module=ACLRoles&action=index", $mod_strings['LIST_ROLES'],"List"),
Array("index.php?module=ACLRoles&action=ListUsers", $mod_strings['LIST_ROLES_BY_USER'],"List"),
$module_menu = array(
array("index.php?module=ACLRoles&action=index", $mod_strings['LIST_ROLES'],"List"),
array("index.php?module=ACLRoles&action=ListUsers", $mod_strings['LIST_ROLES_BY_USER'],"List"),
);

View file

@ -313,7 +313,7 @@ class ACLAction extends SugarBean
$has_user_role = false; //used for user_role_precedence
$has_role = false; //used to determine if default actions can be ignored. If a user has a defined role don't use the defaults
/* END - SECURITY GROUPS */
while ($row = $db->fetchByAssoc($result, FALSE)) {
while ($row = $db->fetchByAssoc($result, false)) {
/* BEGIN - SECURITY GROUPS */
if ($has_user_role == false && $row['user_role'] == 1) {
$has_user_role = true;

Some files were not shown because too many files have changed in this diff Show more