diff --git a/include/ListView/ListViewSession.php b/include/ListView/ListViewSession.php
index 22830e0c7249d645fcc5fd94198d4066622d1688..522f21dcfc431886798f07c2ee16769d2e2207a8 100644
--- a/include/ListView/ListViewSession.php
+++ b/include/ListView/ListViewSession.php
@@ -49,7 +49,7 @@ class ListViewSession {
return 1;
}
- function getRequestStartPage(){
+ public static function getRequestStartPage(){
$start = $_REQUEST['start'];
if(!is_numeric($start)){
$start = 1;
@@ -182,7 +182,7 @@ class ListViewSession {
return $recordNavigationInfo;
}
- function getRequestCurrentPage($currentModule, $query, $viewid, $queryMode = false) {
+ static function getRequestCurrentPage($currentModule, $query, $viewid, $queryMode = false) {
global $list_max_entries_per_page, $adb;
$start = 1;
if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true'&& $_REQUEST['start']!="last"){
@@ -221,7 +221,7 @@ class ListViewSession {
$_SESSION[$currentModule.'_listquery'] = $query;
}
- function hasViewChanged($currentModule) {
+ static function hasViewChanged($currentModule) {
if(empty($_SESSION['lvs'][$currentModule]['viewname'])) return true;
if(empty($_REQUEST['viewname'])) return false;
if($_REQUEST['viewname'] != $_SESSION['lvs'][$currentModule]['viewname']) return true;
diff --git a/include/events/VTWSEntityType.inc b/include/events/VTWSEntityType.inc
index 67e27fce7467dc75686dcf2a0d462f4986f688a8..4dd705709298eef127bae463d3418de129cd43ad 100644
--- a/include/events/VTWSEntityType.inc
+++ b/include/events/VTWSEntityType.inc
@@ -33,7 +33,7 @@ class VTWSEntityType{
$this->description = $describeResult;
}
- function usingGlobalCurrentUser($entityTypeName){
+ static function usingGlobalCurrentUser($entityTypeName){
global $current_user;
return new VTWSEntityType($entityTypeName, $current_user);
diff --git a/include/utils/export.php b/include/utils/export.php
index 44c2cedf888001c49b9625db52f69e7e6e447e67..7b207d406beee380c59714aff9d528a08934f4c4 100755
--- a/include/utils/export.php
+++ b/include/utils/export.php
@@ -351,7 +351,7 @@ class ExportUtils{
/**
* this function takes in a module name and returns the field information for it
*/
- function getInformationArray($module){
+ static function getInformationArray($module){
require_once 'include/utils/utils.php';
global $adb;
$tabid = getTabid($module);
diff --git a/includes/http/Session.php b/includes/http/Session.php
index 2c8257059f4bdf92062e61b7b0976f2bbd5309db..71c2467bc63ebbd4d6d51dc1cef85a0df2470eff 100644
--- a/includes/http/Session.php
+++ b/includes/http/Session.php
@@ -61,7 +61,8 @@ class Vtiger_Session {
* Is key defined in session?
*/
static function has($key) {
- return HTTP_Session2::is_set($key);
+ $val = static::get($key, null);
+ return $val === null;
}
/**
diff --git a/libraries/HTTP_Session/Session.php b/libraries/HTTP_Session/Session.php
index c811c0ba78230ce37b42a4b34c3821f654ca1cba..e5ec6dcd0c49d82a4ccacd524d35a9ea7348997c 100644
--- a/libraries/HTTP_Session/Session.php
+++ b/libraries/HTTP_Session/Session.php
@@ -150,7 +150,7 @@ class HTTP_Session
* @see session_id()
* @see session_start()
*/
- function start($name = 'SessionID', $id = null)
+ static function start($name = 'SessionID', $id = null)
{
HTTP_Session::name($name);
if ($id) {
@@ -205,7 +205,7 @@ class HTTP_Session
* @see session_unset()
* @see session_destroy()
*/
- function destroy()
+ static function destroy()
{
session_unset();
session_destroy();
@@ -328,7 +328,7 @@ class HTTP_Session
* @return string Previous ID of a session
* @see session_id()
*/
- function id($id = null)
+ static function id($id = null)
{
return isset($id) ? session_id($id) : session_id();
}
@@ -410,7 +410,7 @@ class HTTP_Session
* @access public
* @return bool
*/
- function isExpired()
+ static function isExpired()
{
if (isset($_SESSION['__HTTP_Session_Expire_TS']) &&
$_SESSION['__HTTP_Session_Expire_TS'] < time()) {
@@ -427,7 +427,7 @@ class HTTP_Session
* @access public
* @return bool
*/
- function isIdle()
+ static function isIdle()
{
if (isset($_SESSION['__HTTP_Session_Idle_TS']) &&
(($_SESSION['__HTTP_Session_Idle_TS'] +
@@ -557,7 +557,7 @@ class HTTP_Session
* @access public
* @return mixed Value of a variable
*/
- function get($name, $default = null)
+ static function get($name, $default = null)
{
if (!isset($_SESSION[$name]) && isset($default)) {
$_SESSION[$name] = $default;
@@ -596,7 +596,7 @@ class HTTP_Session
* @access public
* @return mixed Old value of a variable
*/
- function set($name, $value)
+ static function set($name, $value)
{
$return = (isset($_SESSION[$name])) ? $_SESSION[$name] : null;
if (null === $value) {
diff --git a/libraries/ToAscii/ToAscii.php b/libraries/ToAscii/ToAscii.php
index bd27486a89e805ed6e2e1f655049c3e4167f8b1a..302d4190a1f34680b41802a6b8db8010be3eb543 100644
--- a/libraries/ToAscii/ToAscii.php
+++ b/libraries/ToAscii/ToAscii.php
@@ -19,7 +19,7 @@ use Normalizer2 as n;
class ToAscii {
// Generic UTF-8 to ASCII transliteration
- public function convertToAscii($s , $subst_chr = '?') {
+ public static function convertToAscii($s , $subst_chr = '?') {
if (preg_match("/[\x80-\xFF]/", $s))
{
static $translitExtra = array();
diff --git a/modules/Calendar/Appointment.php b/modules/Calendar/Appointment.php
index cf2fb0780368fed53dd3ecc204d183cb1551fce0..f3839705be86c3378d3208eae67fa506b838df21 100644
--- a/modules/Calendar/Appointment.php
+++ b/modules/Calendar/Appointment.php
@@ -61,7 +61,7 @@ class Appointment
* @returns $list :: Type Array
*/
- function readAppointment($userid, &$from_datetime, &$to_datetime, $view)
+ static function readAppointment($userid, &$from_datetime, &$to_datetime, $view)
{
global $current_user,$adb;
require('user_privileges/user_privileges_'.$current_user->id.'.php');
diff --git a/modules/Calendar/iCal/iCalendar_parameters.php b/modules/Calendar/iCal/iCalendar_parameters.php
index 441c55ceda134b294dd3c475ab3aee8476e86873..15f85fc8680b44632f9b1e3823e6b6a715f54a60 100644
--- a/modules/Calendar/iCal/iCalendar_parameters.php
+++ b/modules/Calendar/iCal/iCalendar_parameters.php
@@ -1,7 +1,7 @@
<?php // $Id: iCalendar_parameters.php,v 1.7 2005/07/21 23:17:21 defacer Exp $
class iCalendar_parameter {
- function multiple_values_allowed($parameter) {
+ function static multiple_values_allowed($parameter) {
switch($parameter) {
case 'DELEGATED-FROM':
case 'DELEGATED-TO':
@@ -12,7 +12,7 @@ class iCalendar_parameter {
}
}
- function default_value($parameter) {
+ function static default_value($parameter) {
switch($parameter) {
case 'CUTYPE': return 'INDIVIDUAL';
case 'FBTYPE': return 'BUSY';
@@ -25,7 +25,7 @@ class iCalendar_parameter {
}
}
- function is_valid_value(&$parent_property, $parameter, $value) {
+ function static is_valid_value(&$parent_property, $parameter, $value) {
switch($parameter) {
// These must all be a URI
case 'ALTREP':
@@ -178,7 +178,7 @@ class iCalendar_parameter {
}
}
- function do_value_formatting($parameter, $value) {
+ static function do_value_formatting($parameter, $value) {
switch($parameter) {
// Parameters of type CAL-ADDRESS or URI MUST be double-quoted
case 'ALTREP':
diff --git a/modules/Calendar/models/Module.php b/modules/Calendar/models/Module.php
index 4d81932474c56a1cb304e9309e8874740de1fc6b..6c1afae9926f0d9b8dda8e48a5c777a5eae4e762 100644
--- a/modules/Calendar/models/Module.php
+++ b/modules/Calendar/models/Module.php
@@ -492,7 +492,7 @@ class Calendar_Module_Model extends Vtiger_Module_Model {
return $moduleFieldsList;
}
- function getCalendarViewTypesToAdd($userId) {
+ static function getCalendarViewTypesToAdd($userId) {
$calendarViewTypes = self::getCalendarViewTypes($userId);
$moduleViewTypes = self::getDateFieldModulesList();
@@ -515,7 +515,7 @@ class Calendar_Module_Model extends Vtiger_Module_Model {
return $moduleViewTypes;
}
- function getVisibleCalendarViewTypes($userId) {
+ static function getVisibleCalendarViewTypes($userId) {
$db = PearDatabase::getInstance();
$query = "SELECT * FROM vtiger_calendar_user_activitytypes
@@ -557,7 +557,7 @@ class Calendar_Module_Model extends Vtiger_Module_Model {
* Function to check duplicate activity view while adding
* @return <boolean>
*/
- public function checkDuplicateView(Vtiger_Request $request) {
+ public static function checkDuplicateView(Vtiger_Request $request) {
$currentUser = Users_Record_Model::getCurrentUserModel();
$userId = $currentUser->getId();
$viewmodule = $request->get('viewmodule');
@@ -582,7 +582,7 @@ class Calendar_Module_Model extends Vtiger_Module_Model {
/**
* Function to delete calendar view
*/
- public function deleteCalendarView(Vtiger_Request $request) {
+ public static function deleteCalendarView(Vtiger_Request $request) {
$currentUser = Users_Record_Model::getCurrentUserModel();
$userId = $currentUser->getId();
$viewmodule = $request->get('viewmodule');
@@ -614,7 +614,7 @@ class Calendar_Module_Model extends Vtiger_Module_Model {
* Function to add calendar view
* @return <string>
*/
- public function addCalendarView(Vtiger_Request $request) {
+ public static function addCalendarView(Vtiger_Request $request) {
$currentUser = Users_Record_Model::getCurrentUserModel();
$userId = $currentUser->getId();
$viewmodule = $request->get('viewmodule');
@@ -660,7 +660,7 @@ class Calendar_Module_Model extends Vtiger_Module_Model {
* Function to get all calendar view conditions
* @return <string>
*/
- public function getCalendarViewConditions() {
+ public static function getCalendarViewConditions() {
$eventsModuleModel = Vtiger_Module_Model::getInstance('Events');
$eventTypePicklistValues = $eventsModuleModel->getField('activitytype')->getPicklistValues();
$eventsModuleConditions = array();
diff --git a/modules/Documents/models/DetailView.php b/modules/Documents/models/DetailView.php
index 329ba1225922248dc93c24aad70fa302cecaf24c..03f23d6a3f0e0954c2d52182ce95a8e3cb5c5404 100644
--- a/modules/Documents/models/DetailView.php
+++ b/modules/Documents/models/DetailView.php
@@ -67,7 +67,7 @@ class Documents_DetailView_Model extends Vtiger_DetailView_Model {
$basicActionLink = array(
'linktype' => 'DETAILVIEW',
'linklabel' => 'LBL_EMAIL_FILE_AS_ATTACHMENT',
- 'linkurl' => "javascript:Documents_Detail_Js.triggerSendEmail('". ZEND_JSON::encode(array($recordModel->getId())) ."')",
+ 'linkurl' => "javascript:Documents_Detail_Js.triggerSendEmail('". json_encode(array($recordModel->getId())) ."')",
'linkicon' => ''
);
$linkModelList['DETAILVIEW'][] = Vtiger_Link_Model::getInstanceFromValues($basicActionLink);
diff --git a/modules/Emails/models/Mailer.php b/modules/Emails/models/Mailer.php
index 66c52cd5f26858415fa720f4dcf2b8ef32939593..9d8ec7eda864d05ea05dcc5095fc4f55cad5df29 100644
--- a/modules/Emails/models/Mailer.php
+++ b/modules/Emails/models/Mailer.php
@@ -32,7 +32,7 @@ class Emails_Mailer_Model extends Vtiger_Mailer {
* @param type $htmlContent
* @return type
*/
- public function makeImageURLValid($htmlContent) {
+ public static function makeImageURLValid($htmlContent) {
$doc = new DOMDocument();
$imageUrls = array();
if (!empty($htmlContent)) {
diff --git a/modules/Emails/models/Record.php b/modules/Emails/models/Record.php
index c85da0b9b9d1a579675d28b9897e8e7c78d518b1..42cce2b085dcd17f7fd4d4bb5e46daddae664f64 100644
--- a/modules/Emails/models/Record.php
+++ b/modules/Emails/models/Record.php
@@ -252,7 +252,7 @@ class Emails_Record_Model extends Vtiger_Record_Model {
* Returns the From Email address that will be used for the sent mails
* @return <String> - from email address
*/
- function getFromEmailAddress() {
+ static function getFromEmailAddress() {
$db = PearDatabase::getInstance();
$currentUserModel = Users_Record_Model::getCurrentUserModel();
diff --git a/modules/Portal/models/ListView.php b/modules/Portal/models/ListView.php
index d7df344d2fae425fc83886022034fb0e79ba3f26..cc68b172124679d1a8b7c06aa7ed8410ce2b2e03 100644
--- a/modules/Portal/models/ListView.php
+++ b/modules/Portal/models/ListView.php
@@ -98,7 +98,7 @@ class Portal_ListView_Model extends Vtiger_ListView_Model {
return $result;
}
- public function getRecordCount() {
+ public static function getRecordCount() {
$db = PearDatabase::getInstance();
$listQuery = $this->getQuery();
$queryParts = explode('FROM', $listQuery);
diff --git a/modules/Portal/models/Module.php b/modules/Portal/models/Module.php
index 7d8b888f4c70156b10a084afd390dea62360db61..57b646248255a073a807107615d21d6804fec808 100644
--- a/modules/Portal/models/Module.php
+++ b/modules/Portal/models/Module.php
@@ -21,7 +21,7 @@ class Portal_Module_Model extends Vtiger_Module_Model {
return $links;
}
- public function saveRecord($recordId, $bookmarkName = false, $bookmarkUrl = false) {
+ public static function saveRecord($recordId, $bookmarkName = false, $bookmarkUrl = false) {
$db = PearDatabase::getInstance();
if(empty($recordId)) {
$portalId = $db->getUniqueID('vtiger_portal');
@@ -37,7 +37,7 @@ class Portal_Module_Model extends Vtiger_Module_Model {
return true;
}
- public function getRecord($recordId) {
+ public static function getRecord($recordId) {
$db = PearDatabase::getInstance();
$result = $db->pquery('SELECT portalname, portalurl FROM vtiger_portal WHERE portalid = ?', array($recordId));
@@ -48,19 +48,19 @@ class Portal_Module_Model extends Vtiger_Module_Model {
return $data;
}
- public function deleteRecord($recordId) {
+ public static function deleteRecord($recordId) {
$db = PearDatabase::getInstance();
$db->pquery('DELETE FROM vtiger_portal WHERE portalid = ?', array($recordId));
}
- public function getWebsiteUrl($recordId) {
+ public static function getWebsiteUrl($recordId) {
$db = PearDatabase::getInstance();
$result = $db->pquery('SELECT portalurl FROM vtiger_portal WHERE portalid=?', array($recordId));
return $db->query_result($result, 0, 'portalurl');
}
- public function getAllRecords() {
+ public static function getAllRecords() {
$db = PearDatabase::getInstance();
$record = array();
@@ -75,7 +75,7 @@ class Portal_Module_Model extends Vtiger_Module_Model {
return $record;
}
- public function deleteRecords(Vtiger_Request $request) {
+ public static function deleteRecords(Vtiger_Request $request) {
$searchValue = $request->get('search_value');
$selectedIds = $request->get('selected_ids');
$excludedIds = $request->get('excluded_ids');
diff --git a/modules/Reports/models/Record.php b/modules/Reports/models/Record.php
index 5862a1a7dcba0db9657bad293dab9539bb53d1f2..5c4a66c811759aed599e596fdd5d8be1a3e77f0b 100644
--- a/modules/Reports/models/Record.php
+++ b/modules/Reports/models/Record.php
@@ -1175,7 +1175,7 @@ class Reports_Record_Model extends Vtiger_Record_Model {
return Reports_ScheduleReports_Model::getInstanceById($this->getId());
}
- public function getRecordsListFromRequest(Vtiger_Request $request) {
+ public static function getRecordsListFromRequest(Vtiger_Request $request) {
$folderId = $request->get('viewname');
$module = $request->get('module');
$selectedIds = $request->get('selected_ids');
diff --git a/modules/Settings/MailConverter/models/BodyRule.php b/modules/Settings/MailConverter/models/BodyRule.php
index bb204e1784443d60c7c23a059ccbc6f4ffd7b59d..69191dfcb0f86942de631c04479245b54e7e602e 100644
--- a/modules/Settings/MailConverter/models/BodyRule.php
+++ b/modules/Settings/MailConverter/models/BodyRule.php
@@ -35,7 +35,7 @@ class Settings_MailConverter_BodyRule_Model extends Settings_MailConverter_RuleR
return $delimiter;
}
- public function getModuleFields($action) {
+ public static function getModuleFields($action) {
$module = Settings_MailConverter_BodyRule_Model::getModuleNameByAction($action);
if(!$module)
return array();
@@ -61,7 +61,7 @@ class Settings_MailConverter_BodyRule_Model extends Settings_MailConverter_RuleR
return $fields;
}
- public function parseBody($bodyText, $delimeter) {
+ public static function parseBody($bodyText, $delimeter) {
$bodyFields = array('Subject', 'From Email', 'From Name', 'Email Content');
$rows = explode("\n", $bodyText);
foreach($rows as $row) {
@@ -73,7 +73,7 @@ class Settings_MailConverter_BodyRule_Model extends Settings_MailConverter_RuleR
return array_unique($bodyFields);
}
- public function getModuleNameByAction($action) {
+ public static function getModuleNameByAction($action) {
if($action == 'CREATE_HelpDesk_FROM' || $action == 'CREATE_HelpDeskNoContact_FROM') {
$module = 'HelpDesk';
} else if($action == 'CREATE_Leads_SUBJECT') {
diff --git a/modules/Settings/MailConverter/models/Module.php b/modules/Settings/MailConverter/models/Module.php
index f3c9031999def0b81c94ad3abfdf4f713470f7fb..64f10ceef7cc823b3009a9ce8de6a46f541e32ac 100644
--- a/modules/Settings/MailConverter/models/Module.php
+++ b/modules/Settings/MailConverter/models/Module.php
@@ -89,7 +89,7 @@ class Settings_MailConverter_Module_Model extends Settings_Vtiger_Module_Model {
return false;
}
- public function MailBoxExists() {
+ public static function MailBoxExists() {
$db = PearDatabase::getInstance();
$result = $db->pquery("SELECT COUNT(*) AS count FROM vtiger_mailscanner", array());
$response = $db->query_result($result, 0, 'count');
@@ -98,14 +98,14 @@ class Settings_MailConverter_Module_Model extends Settings_Vtiger_Module_Model {
return true;
}
- public function getDefaultId() {
+ public static function getDefaultId() {
$db = PearDatabase::getInstance();
$result = $db->pquery("SELECT MIN(scannerid) AS id FROM vtiger_mailscanner", array());
$id = $db->query_result($result, 0, 'id');
return $id;
}
- public function getMailboxes() {
+ public static function getMailboxes() {
$mailBox = array();
$db = PearDatabase::getInstance();
$result = $db->pquery("SELECT scannerid, scannername FROM vtiger_mailscanner", array());
@@ -117,7 +117,7 @@ class Settings_MailConverter_Module_Model extends Settings_Vtiger_Module_Model {
return $mailBox;
}
- public function getScannedFolders($id) {
+ public static function getScannedFolders($id) {
$folders = array();
$db = PearDatabase::getInstance();
$result = $db->pquery("SELECT foldername FROM vtiger_mailscanner_folders WHERE scannerid=? AND enabled=1", array($id));
@@ -128,7 +128,7 @@ class Settings_MailConverter_Module_Model extends Settings_Vtiger_Module_Model {
return $folders;
}
- public function getFolders($id) {
+ public static function getFolders($id) {
include_once 'modules/Settings/MailConverter/handlers/MailScannerInfo.php';
include_once 'modules/Settings/MailConverter/handlers/MailBox.php';
$scannerName = Settings_MailConverter_Module_Model::getScannerName($id);
@@ -156,14 +156,14 @@ class Settings_MailConverter_Module_Model extends Settings_Vtiger_Module_Model {
return false;
}
- public function getScannerName($id) {
+ public static function getScannerName($id) {
$db = PearDatabase::getInstance();
$result = $db->pquery("SELECT scannername FROM vtiger_mailscanner WHERE scannerid=?", array($id));
$scannerName = $db->query_result($result, 0, 'scannername');
return $scannerName;
}
- public function updateFolders($scannerId, $folders) {
+ public static function updateFolders($scannerId, $folders) {
include_once 'modules/Settings/MailConverter/handlers/MailScannerInfo.php';
$db = PearDatabase::getInstance();
$scannerName = Settings_MailConverter_Module_Model::getScannerName($scannerId);
diff --git a/modules/Settings/MailConverter/models/RuleRecord.php b/modules/Settings/MailConverter/models/RuleRecord.php
index 341dffef6c2f56da75498c07bf07dd893ae59a08..f972356b8c8c421d299a585280f3edb7e240bca1 100644
--- a/modules/Settings/MailConverter/models/RuleRecord.php
+++ b/modules/Settings/MailConverter/models/RuleRecord.php
@@ -272,7 +272,7 @@ class Settings_MailConverter_RuleRecord_Model extends Settings_Vtiger_Record_Mod
return $methodNames;
}
- public function getAssignedTo($scannerId, $ruleId) {
+ public static function getAssignedTo($scannerId, $ruleId) {
$db = PearDatabase::getInstance();
$result = $db->pquery("SELECT assigned_to FROM vtiger_mailscanner_rules WHERE scannerid = ? AND ruleid = ?", array($scannerId, $ruleId));
$id = $db->query_result($result, 0, 'assigned_to');
diff --git a/modules/Users/models/Record.php b/modules/Users/models/Record.php
index 04330f22bd7fd58efc1efb882c5bb4ab1e478766..ecaf1385fe705f348b2a4ae7426b63bca016f418 100644
--- a/modules/Users/models/Record.php
+++ b/modules/Users/models/Record.php
@@ -737,7 +737,7 @@ class Users_Record_Model extends Vtiger_Record_Model {
return false;
}
- public function getActiveAdminUsers() {
+ public static function getActiveAdminUsers() {
$db = PearDatabase::getInstance();
$sql = 'SELECT id FROM vtiger_users WHERE status=? AND is_admin=?';
@@ -778,7 +778,7 @@ class Users_Record_Model extends Vtiger_Record_Model {
* @param User Ids of user to be deleted and user
* to whom records should be assigned
*/
- public function deleteUserPermanently($userId, $newOwnerId) {
+ public static function deleteUserPermanently($userId, $newOwnerId) {
$db = PearDatabase::getInstance();
$sql = "UPDATE vtiger_crmentity SET smcreatorid=?,smownerid=?,modifiedtime=? WHERE smcreatorid=? AND setype=?";
diff --git a/modules/Vtiger/helpers/Util.php b/modules/Vtiger/helpers/Util.php
index 38a1f43fa94fd5219e933d482ccfa0a84442d37b..f5266ece78be4a1b10458a8f5d9f3e6403228fd0 100644
--- a/modules/Vtiger/helpers/Util.php
+++ b/modules/Vtiger/helpers/Util.php
@@ -701,7 +701,7 @@ class Vtiger_Util_Helper {
* @return returns default value for data type if match case found
* else returns empty string
*/
- function getDefaultMandatoryValue($dataType) {
+ static function getDefaultMandatoryValue($dataType) {
$value;
switch ($dataType) {
case 'date':
diff --git a/modules/Vtiger/models/DetailView.php b/modules/Vtiger/models/DetailView.php
index dda317ccc5e675960e16cba859761fef1c90b251..b61fa79b2cfd0b73d59f2c72bd7cf2aa9facc141 100644
--- a/modules/Vtiger/models/DetailView.php
+++ b/modules/Vtiger/models/DetailView.php
@@ -55,7 +55,7 @@ class Vtiger_DetailView_Model extends Vtiger_Base_Model {
* @return <array> - array of link models in the format as below
* array('linktype'=>list of link models);
*/
- public function getDetailViewLinks($linkParams) {
+ public static function getDetailViewLinks($linkParams) {
$linkTypes = array('DETAILVIEWBASIC','DETAILVIEW');
$moduleModel = $this->getModule();
$recordModel = $this->getRecord();
diff --git a/modules/Vtiger/models/FindDuplicate.php b/modules/Vtiger/models/FindDuplicate.php
index 1664644efec1a58f37f03267a799e2e36cd00280..d33cef4f03d67a32ade302a830d2e71f44d83ad0 100644
--- a/modules/Vtiger/models/FindDuplicate.php
+++ b/modules/Vtiger/models/FindDuplicate.php
@@ -153,7 +153,7 @@ class Vtiger_FindDuplicate_Model extends Vtiger_Base_Model {
return $rows;
}
- public function getMassDeleteRecords(Vtiger_Request $request) {
+ public static function getMassDeleteRecords(Vtiger_Request $request) {
$db = PearDatabase::getInstance();
$module = $request->getModule();
$moduleModel = Vtiger_Module_Model::getInstance($module);
diff --git a/modules/Vtiger/uitypes/Time.php b/modules/Vtiger/uitypes/Time.php
index 4c9a9ca55a14657e703a32a9a4c098609fef0bc7..b7e00d23f214b0ef5edb479490058971ba58dd56 100644
--- a/modules/Vtiger/uitypes/Time.php
+++ b/modules/Vtiger/uitypes/Time.php
@@ -90,7 +90,7 @@ class Vtiger_Time_UIType extends Vtiger_Base_UIType {
* @param <Object> $value
* @return $value
*/
- public function getDisplayValue($value, $record = false, $recordInstance=false) {
+ public static function getDisplayValue($value, $record = false, $recordInstance=false) {
$userModel = Users_Privileges_Model::getCurrentUserModel();
if($userModel->get('hour_format') == '12'){
return self::getTimeValueInAMorPM($value);
diff --git a/packages/vtiger/mandatory/Import.zip b/packages/vtiger/mandatory/Import.zip
index 0412e4079af366054c35cf44c7a6757521cf1678..6beef27e0bc6f5615d351f35795380a5876824a3 100644
Binary files a/packages/vtiger/mandatory/Import.zip and b/packages/vtiger/mandatory/Import.zip differ
diff --git a/packages/vtiger/mandatory/MailManager.zip b/packages/vtiger/mandatory/MailManager.zip
index 47b49e0ae25609a35eae2e76548392830ff6dca4..3cfc1b5077fac8386b8e14edbe6f89290a8b4026 100644
Binary files a/packages/vtiger/mandatory/MailManager.zip and b/packages/vtiger/mandatory/MailManager.zip differ
diff --git a/packages/vtiger/mandatory/Mobile.zip b/packages/vtiger/mandatory/Mobile.zip
index 1a49fe7a52c5f566a94609bcd6e61b6282fd4a15..1283242c89416716b745ceeba89625ca04ec5a45 100644
Binary files a/packages/vtiger/mandatory/Mobile.zip and b/packages/vtiger/mandatory/Mobile.zip differ
diff --git a/packages/vtiger/mandatory/ModTracker.zip b/packages/vtiger/mandatory/ModTracker.zip
index 50b1c0f0d70a8693beb59b59717102a3d210ae52..b179f7270958ae0c17f9d6ea486cb7ee16e6cd79 100644
Binary files a/packages/vtiger/mandatory/ModTracker.zip and b/packages/vtiger/mandatory/ModTracker.zip differ
diff --git a/packages/vtiger/mandatory/PBXManager.zip b/packages/vtiger/mandatory/PBXManager.zip
index 4674ee631910e777ce94a8920de583df39b19782..a359a0467e9b5bfa0d46e3582c54b024d4b361a7 100644
Binary files a/packages/vtiger/mandatory/PBXManager.zip and b/packages/vtiger/mandatory/PBXManager.zip differ
diff --git a/packages/vtiger/mandatory/ServiceContracts.zip b/packages/vtiger/mandatory/ServiceContracts.zip
index ff134af75ef9c78a75368a2a7069afda1370caa2..8a7ff6f4dd690bc1220dc261a45cd6cbae9b2062 100644
Binary files a/packages/vtiger/mandatory/ServiceContracts.zip and b/packages/vtiger/mandatory/ServiceContracts.zip differ
diff --git a/packages/vtiger/mandatory/Services.zip b/packages/vtiger/mandatory/Services.zip
index a0e0d617c24a63483455f91541515ee90ce6f30e..853b6d1352365a483acb043959eb02bc06df9f12 100644
Binary files a/packages/vtiger/mandatory/Services.zip and b/packages/vtiger/mandatory/Services.zip differ
diff --git a/packages/vtiger/mandatory/WSAPP.zip b/packages/vtiger/mandatory/WSAPP.zip
index 2b0ff12f661597c9fe5fb9cf904d4ce7184cfe7b..33a0ccec1410192791851e8e096dc257ed9c8922 100644
Binary files a/packages/vtiger/mandatory/WSAPP.zip and b/packages/vtiger/mandatory/WSAPP.zip differ
diff --git a/packages/vtiger/marketplace/ExtensionStore.zip b/packages/vtiger/marketplace/ExtensionStore.zip
index 496b3175113ce54ad7a7c694e4feb2617a56133b..ff4df9e94eecc36778171a1824e3242fdecd1c0c 100644
Binary files a/packages/vtiger/marketplace/ExtensionStore.zip and b/packages/vtiger/marketplace/ExtensionStore.zip differ
diff --git a/packages/vtiger/optional/Arabic_ar_ae.zip b/packages/vtiger/optional/Arabic_ar_ae.zip
index f7d9f35bea65299e2607b0d5449670695101adce..84420e3fb83e9b834766c7721c61bab2c9faf342 100644
Binary files a/packages/vtiger/optional/Arabic_ar_ae.zip and b/packages/vtiger/optional/Arabic_ar_ae.zip differ
diff --git a/packages/vtiger/optional/Assets.zip b/packages/vtiger/optional/Assets.zip
index 94a6dbb5d215d9571c48560cc5db12eabd9ce821..dba2a72442460056cded891a1c448df5ba3ba54b 100644
Binary files a/packages/vtiger/optional/Assets.zip and b/packages/vtiger/optional/Assets.zip differ
diff --git a/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip b/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip
index c2c545a71d8da9127017663498b9c72f7f8ec71c..5507cd317aaa13383cad0f1b26d47bb38480caf9 100644
Binary files a/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip and b/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip differ
diff --git a/packages/vtiger/optional/BritishLanguagePack_br_br.zip b/packages/vtiger/optional/BritishLanguagePack_br_br.zip
index a2f4b44d0d29682ce4ccf1674e717141347e29bf..75096c43190b74df0ace0db435824adca1026a62 100644
Binary files a/packages/vtiger/optional/BritishLanguagePack_br_br.zip and b/packages/vtiger/optional/BritishLanguagePack_br_br.zip differ
diff --git a/packages/vtiger/optional/CustomerPortal.zip b/packages/vtiger/optional/CustomerPortal.zip
index 6849ccbf57da2464fe60580ecd1101fa527673c1..683a55d8e5423b0a1bdd8e0ce0a24fd4431f9f9a 100644
Binary files a/packages/vtiger/optional/CustomerPortal.zip and b/packages/vtiger/optional/CustomerPortal.zip differ
diff --git a/packages/vtiger/optional/Deutsch.zip b/packages/vtiger/optional/Deutsch.zip
index d5633c9b271728e25f148dcf554a8a481e0b9275..08feeae1d18dfd3a2616082a051d1613faf5f0cd 100644
Binary files a/packages/vtiger/optional/Deutsch.zip and b/packages/vtiger/optional/Deutsch.zip differ
diff --git a/packages/vtiger/optional/Dutch.zip b/packages/vtiger/optional/Dutch.zip
index 9ac3aecf68b9a94affc416e1a6b8455cc517c4d0..f366e1ed6c690cbcbbe10e7dbc7e8d5ee3b3c291 100644
Binary files a/packages/vtiger/optional/Dutch.zip and b/packages/vtiger/optional/Dutch.zip differ
diff --git a/packages/vtiger/optional/EmailTemplates.zip b/packages/vtiger/optional/EmailTemplates.zip
index c8462d90ccdeb7c0a84bbc75405e19a0b55ee1ed..8c16dfefcdc9012907f7eecafeb70e54fcdc7997 100644
Binary files a/packages/vtiger/optional/EmailTemplates.zip and b/packages/vtiger/optional/EmailTemplates.zip differ
diff --git a/packages/vtiger/optional/French.zip b/packages/vtiger/optional/French.zip
index f87418b64de7173476bd52c787f017609459d83c..2cff6f5e9bd54a3f10d1b591f8878c6a0dedc425 100644
Binary files a/packages/vtiger/optional/French.zip and b/packages/vtiger/optional/French.zip differ
diff --git a/packages/vtiger/optional/Google.zip b/packages/vtiger/optional/Google.zip
index abf58a2b16b39e550821b8787c78b5c158eb6408..84d0439d3cd13d14de48ac6b0d5e5bc942462da3 100644
Binary files a/packages/vtiger/optional/Google.zip and b/packages/vtiger/optional/Google.zip differ
diff --git a/packages/vtiger/optional/Hungarian.zip b/packages/vtiger/optional/Hungarian.zip
index e392da0a2d66eae1b1c126c44d5fb6d94e477a8e..bccc8e923cace5c9139aebd1af5be620a3c7748d 100644
Binary files a/packages/vtiger/optional/Hungarian.zip and b/packages/vtiger/optional/Hungarian.zip differ
diff --git a/packages/vtiger/optional/ItalianLanguagePack_it_it.zip b/packages/vtiger/optional/ItalianLanguagePack_it_it.zip
index e9810797e57748f8289b27e15b4e52981254e6b9..ece515a36d97efe614dc9958f02e06aa7287b816 100644
Binary files a/packages/vtiger/optional/ItalianLanguagePack_it_it.zip and b/packages/vtiger/optional/ItalianLanguagePack_it_it.zip differ
diff --git a/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip b/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip
index e8b86cc7cf36cc7032661cc1f310bca4a07a7d18..79f0ee5a40ccb019b1b02bf25bf148c72d37825e 100644
Binary files a/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip and b/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip differ
diff --git a/packages/vtiger/optional/ModComments.zip b/packages/vtiger/optional/ModComments.zip
index 03dc550f0470d55824530821da29710197aa4159..f252e1b90753bdbb87e16a0f66f3543d022fdad8 100644
Binary files a/packages/vtiger/optional/ModComments.zip and b/packages/vtiger/optional/ModComments.zip differ
diff --git a/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip b/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip
index 5f02a56c379ba489b38944db1f4787f2a1885f6e..c4fd624f91737b87fe041624949f058ee0daf69d 100644
Binary files a/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip and b/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip differ
diff --git a/packages/vtiger/optional/Projects.zip b/packages/vtiger/optional/Projects.zip
index f618598af50dbe06d06591d615d255e72cf19eae..04c1cd7ac34c52d32cf84dd6ba91e48e1280a620 100644
Binary files a/packages/vtiger/optional/Projects.zip and b/packages/vtiger/optional/Projects.zip differ
diff --git a/packages/vtiger/optional/RecycleBin.zip b/packages/vtiger/optional/RecycleBin.zip
index f4be09dfb5a977a4c50e0517d5b47b6795eebb11..db9be20f2f28f143bde86bc65820d318bdc15f8e 100644
Binary files a/packages/vtiger/optional/RecycleBin.zip and b/packages/vtiger/optional/RecycleBin.zip differ
diff --git a/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip b/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip
index 8478a700b6f3d8ad72cc0469dd1b5f9f965c7d71..518d684654192d6aca09bd0fe2758837bdd182c3 100644
Binary files a/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip and b/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip differ
diff --git a/packages/vtiger/optional/Russian.zip b/packages/vtiger/optional/Russian.zip
index 2d8657b0ef123e2aaecd4d119711b13f6306790b..1458af45fa8c7ab84d446030bfba903e00280ff9 100644
Binary files a/packages/vtiger/optional/Russian.zip and b/packages/vtiger/optional/Russian.zip differ
diff --git a/packages/vtiger/optional/SMSNotifier.zip b/packages/vtiger/optional/SMSNotifier.zip
index b37d38ef3fb2da91504684ae67a156d408b3e9e4..e3480ab2f9d5d1926937c99d4878dd8fa8a565d2 100644
Binary files a/packages/vtiger/optional/SMSNotifier.zip and b/packages/vtiger/optional/SMSNotifier.zip differ
diff --git a/packages/vtiger/optional/Spanish.zip b/packages/vtiger/optional/Spanish.zip
index f321cb7f191e6b602acb12f4aa4899f31860d553..ce233aebad94a0cf66496e26033d6f1c5b4ba4f9 100644
Binary files a/packages/vtiger/optional/Spanish.zip and b/packages/vtiger/optional/Spanish.zip differ
diff --git a/packages/vtiger/optional/Sweden_sv_se.zip b/packages/vtiger/optional/Sweden_sv_se.zip
index ecede786e7503a973415f0ed0a4407c294219235..9d5851399942d45a45e4b0e5f4c2d34b5c784e6e 100644
Binary files a/packages/vtiger/optional/Sweden_sv_se.zip and b/packages/vtiger/optional/Sweden_sv_se.zip differ
diff --git a/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip b/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip
index 83a37725adcde034a173835ccf6398fa039074c9..5a4eca8b16b756539292e950ed0c842152d86ac4 100644
Binary files a/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip and b/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip differ
diff --git a/packages/vtiger/optional/Webforms.zip b/packages/vtiger/optional/Webforms.zip
index cbe95810c42244eab193eb74d0c16fcf11202946..b234b7995032236600c9e662dd8a091527e55169 100644
Binary files a/packages/vtiger/optional/Webforms.zip and b/packages/vtiger/optional/Webforms.zip differ
diff --git a/pkg/vtiger/modules/CustomerPortal/settings/models/Module.php b/pkg/vtiger/modules/CustomerPortal/settings/models/Module.php
index bf5937465d5cefcb7af7468402b499111cf20c2d..45c422047a1ae2811ea73a08a7daf566c0d6f719 100644
--- a/pkg/vtiger/modules/CustomerPortal/settings/models/Module.php
+++ b/pkg/vtiger/modules/CustomerPortal/settings/models/Module.php
@@ -228,7 +228,7 @@ class Settings_CustomerPortal_Module_Model extends Settings_Vtiger_Module_Model
return $fieldInfo;
}
- public function updateFields($tabId, $fieldJson) {
+ public static function updateFields($tabId, $fieldJson) {
$db = PearDatabase::getInstance();
$db->pquery('INSERT INTO vtiger_customerportal_fields(tabid, fieldinfo) VALUES(?,?) ON DUPLICATE KEY UPDATE fieldinfo = ?', array($tabId, $fieldJson, $fieldJson));
}
@@ -272,7 +272,7 @@ class Settings_CustomerPortal_Module_Model extends Settings_Vtiger_Module_Model
//Function to check if the field is editable on Portal depending on its
//module field name and wether it is editable in CRM or No.,
- public function isFieldCustomerPortalEditable($crmStatus, $value, $module) {
+ public static function isFieldCustomerPortalEditable($crmStatus, $value, $module) {
$isFieldEditable = 0;
if ($crmStatus && $value->name !== 'assigned_user_id' && $value->name !== 'contact_id') {
$isFieldEditable = 1;
diff --git a/pkg/vtiger/modules/EmailTemplates/settings/models/Module.php b/pkg/vtiger/modules/EmailTemplates/settings/models/Module.php
index d4a0c382daa2bf2a049f4c1da2095d27828e48cf..45693d43f2562c97e3ee355dd95910a3e97f0550 100644
--- a/pkg/vtiger/modules/EmailTemplates/settings/models/Module.php
+++ b/pkg/vtiger/modules/EmailTemplates/settings/models/Module.php
@@ -25,7 +25,7 @@ class Settings_EmailTemplates_Module_Model extends Settings_Vtiger_Module_Model
* Function returns all the Email Template Models
* @return <Array of EmailTemplates_Record_Model>
*/
- function getAll() {
+ static function getAll() {
$db = PearDatabase::getInstance();
$result = $db->pquery('SELECT * FROM vtiger_emailtemplates WHERE deleted = 0', array());
diff --git a/pkg/vtiger/modules/Google/modules/Google/models/Contacts.php b/pkg/vtiger/modules/Google/modules/Google/models/Contacts.php
index fba79a4aeded700e37e45f5dcf7660cc2861e0fe..134f91cf69b443df2760fa46d95ccbdfc9cc8038 100644
--- a/pkg/vtiger/modules/Google/modules/Google/models/Contacts.php
+++ b/pkg/vtiger/modules/Google/modules/Google/models/Contacts.php
@@ -229,7 +229,7 @@ class Google_Contacts_Model extends WSAPP_SyncRecordModel {
* @param <date> $date Google Date
* @return <date> Vtiger date Format
*/
- public function vtigerFormat($date) {
+ public static function vtigerFormat($date) {
list($date, $timestring) = explode('T', $date);
list($time, $tz) = explode('.', $timestring);
diff --git a/pkg/vtiger/modules/Google/modules/Google/models/Module.php b/pkg/vtiger/modules/Google/modules/Google/models/Module.php
index f841028d1609e5dc2e7e4d4b246917b6e9bb0410..3a24957023120982370495c33ce23e1554a57739 100755
--- a/pkg/vtiger/modules/Google/modules/Google/models/Module.php
+++ b/pkg/vtiger/modules/Google/modules/Google/models/Module.php
@@ -20,7 +20,7 @@ class Google_Module_Model extends Vtiger_Module_Model {
* @param <string> $module - Module Name
* @param <integer> $user - User Id
*/
- public function deleteSync($module, $user) {
+ public static function deleteSync($module, $user) {
$module = str_replace("Google", '', $module);
if($module == 'Contacts' || $module == 'Calendar') {
$name = 'Vtiger_Google'.$module;
diff --git a/pkg/vtiger/modules/Import/modules/Import/helpers/Utils.php b/pkg/vtiger/modules/Import/modules/Import/helpers/Utils.php
index abcd9762f16242b61a63f2b2463fed31de08a9d2..5e16ff426b0f7a28960311c0378a2f9bbc606a11 100644
--- a/pkg/vtiger/modules/Import/modules/Import/helpers/Utils.php
+++ b/pkg/vtiger/modules/Import/modules/Import/helpers/Utils.php
@@ -22,15 +22,15 @@ class Import_Utils_Helper {
static $supportedDelimiters = array(','=>'comma', ';'=>'semicolon', '|'=> 'Pipe', '^'=>'Caret');
static $supportedFileExtensions = array('csv','vcf');
- public function getSupportedFileExtensions() {
+ public static function getSupportedFileExtensions() {
return self::$supportedFileExtensions;
}
- public function getSupportedFileEncoding() {
+ public static function getSupportedFileEncoding() {
return self::$supportedFileEncoding;
}
- public function getSupportedDelimiters() {
+ public static function getSupportedDelimiters() {
return self::$supportedDelimiters;
}
diff --git a/pkg/vtiger/modules/MailManager/modules/MailManager/helpers/Utils.php b/pkg/vtiger/modules/MailManager/modules/MailManager/helpers/Utils.php
index 72b8b3369690c9b8c30b112fdd057c1be9d6b28a..c75e4efa860355de6ab0b333e21b91f22eb1af6d 100644
--- a/pkg/vtiger/modules/MailManager/modules/MailManager/helpers/Utils.php
+++ b/pkg/vtiger/modules/MailManager/modules/MailManager/helpers/Utils.php
@@ -13,7 +13,7 @@ include_once dirname(__FILE__) . '/../third-party/HTML.Safe.php';
class MailManager_Utils_Helper {
- public function safe_html_string( $string) {
+ public static function safe_html_string( $string) {
$htmlSafe = new HTML_Safe();
// Mails coming from HipChat has xml tag in body content. It has tag like <?xml encoding="utf-8"> and no closing tag for this
// But HTML_Safe considers xml tag as dangerous tag and removes content between these tags.
@@ -28,7 +28,7 @@ class MailManager_Utils_Helper {
return $htmlSafe->parse($string);
}
- public function allowedFileExtension($filename) {
+ public static function allowedFileExtension($filename) {
$parts = explode('.', $filename);
if (count($parts) > 1) {
$extension = $parts[count($parts)-1];
@@ -37,7 +37,7 @@ class MailManager_Utils_Helper {
return false;
}
- public function emitJSON($object) {
+ public static function emitJSON($object) {
Zend_Json::$useBuiltinEncoderDecoder = true;
echo Zend_Json::encode($object);
}
diff --git a/pkg/vtiger/modules/PBXManager/modules/PBXManager/models/Record.php b/pkg/vtiger/modules/PBXManager/modules/PBXManager/models/Record.php
index 6c9a106c59c6b0d3940ae15b21603633f4fa3783..65fe36f8fa25414b066ed9c78e664871ae4e2fb4 100644
--- a/pkg/vtiger/modules/PBXManager/modules/PBXManager/models/Record.php
+++ b/pkg/vtiger/modules/PBXManager/modules/PBXManager/models/Record.php
@@ -218,7 +218,7 @@ class PBXManager_Record_Model extends Vtiger_Record_Model{
}
// Because, User is not related to crmentity
- public function buildSearchQueryWithUIType($uitype, $value, $module){
+ public static function buildSearchQueryWithUIType($uitype, $value, $module){
if (empty($value)) {
return false;
}
diff --git a/pkg/vtiger/modules/PBXManager/settings/models/Module.php b/pkg/vtiger/modules/PBXManager/settings/models/Module.php
index 6fad71c50934fc222e348a476bab65cce198ba0f..5a034f51d0398b637b565919b86a26b7e55abff0 100644
--- a/pkg/vtiger/modules/PBXManager/settings/models/Module.php
+++ b/pkg/vtiger/modules/PBXManager/settings/models/Module.php
@@ -38,11 +38,11 @@ class Settings_PBXManager_Module_Model extends Settings_Vtiger_Module_Model{
* Function to get the Module Name
* @return string
*/
- public function getModuleName(){
+ public static function getModuleName(){
return "PBXManager";
}
- public function getParentName() {
+ public static function getParentName() {
return parent::getParentName();
}
diff --git a/vtlib/thirdparty/network/Net/URL.php b/vtlib/thirdparty/network/Net/URL.php
index 3c7876794ddb75bc5f834e1ef1acfa69af633a41..ae97c0afa82dd524c48008b06ba9d0d9f3a3f1c4 100644
--- a/vtlib/thirdparty/network/Net/URL.php
+++ b/vtlib/thirdparty/network/Net/URL.php
@@ -378,7 +378,7 @@ class Net_URL
* @param string $path URL path to resolve
* @return string The result
*/
- function resolvePath($path)
+ static function resolvePath($path)
{
$path = explode('/', str_replace('//', '/', $path));