deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:tony-landis/agilebill

Browse Source
This commit is contained in:
Scott Luther 2009-03-26 15:01:02 -07:00
commit 84b2ea32d5
20 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/pdf/pdf_invoice_overview.inc.php
View File

@ -233,9 +233,9 @@ class pdf_invoice_overview extends pdf_invoice_base
# Draw attributes if they are present # Draw attributes if they are present
if (strlen($line['attr'])) { if (strlen($line['attr'])) {
$atrs = split("\r\n", str_replace('\r\n',"\r\n",$line['attr'])); $atrs = preg_split("/\r\n/", str_replace('\r\n',"\r\n",$line['attr']));
foreach ($atrs as $a) { foreach ($atrs as $a) {
$parts = split("==", $a); $parts = preg_split("/==/", $a);
switch ($parts[0]) { switch ($parts[0]) {
default: default:
if(strlen($parts[0])) if(strlen($parts[0]))

4
includes/pdf/pdf_invoice_voip-detailed.inc.php
View File

@ -276,9 +276,9 @@ class pdf_invoice_overview extends pdf_invoice_base
$val = $line['name']; $val = $line['name'];
if (strlen($line['attr'])) { if (strlen($line['attr'])) {
$val = ""; $val = "";
$atrs = split("\r\n", str_replace('\r\n',"\r\n",$line['attr'])); $atrs = preg_split("/\r\n/", str_replace('\r\n',"\r\n",$line['attr']));
foreach ($atrs as $a) { foreach ($atrs as $a) {
$parts = split("==", $a); $parts = preg_split("/==/", $a);
switch ($parts[0]) { switch ($parts[0]) {
case "Destination": case "Destination":
$this->SetX(69); $this->SetX(69);

8
includes/pdf/pdf_invoice_voip.inc.php
View File

@ -204,9 +204,9 @@ class pdf_invoice_overview extends pdf_invoice_base
$val = $line['name']; $val = $line['name'];
if (strlen($line['attr'])) { if (strlen($line['attr'])) {
$val = ""; $val = "";
$atrs = split("\r\n", str_replace('\r\n',"\r\n",$line['attr'])); $atrs = preg_split("/\r\n/", str_replace('\r\n',"\r\n",$line['attr']));
foreach ($atrs as $a) { foreach ($atrs as $a) {
$parts = split("==", $a); $parts = preg_split("/==/", $a);
switch ($parts[0]) { switch ($parts[0]) {
case "Destination": case "Destination":
$this->SetX(75); $this->SetX(75);
@ -229,9 +229,9 @@ class pdf_invoice_overview extends pdf_invoice_base
case "parent_service_id": case "parent_service_id":
$sql = sqlSelect($db,"service","prod_attr","id=::".$parts[1]."::"); $sql = sqlSelect($db,"service","prod_attr","id=::".$parts[1]."::");
$rstmp = $db->Execute($sql); $rstmp = $db->Execute($sql);
$atrs2 = split("\r\n", $rstmp->fields['prod_attr']); $atrs2 = preg_split("/\r\n/", $rstmp->fields['prod_attr']);
foreach ($atrs2 as $a2) { foreach ($atrs2 as $a2) {
$parts2 = split("==", $a2); $parts2 = preg_split("/==/", $a2);
switch ($parts2[0]) { switch ($parts2[0]) {
case "station": case "station":
case "ported": case "ported":

4
includes/phplayers/layersmenu-common.inc.php
View File

@ -484,7 +484,7 @@ function setMenuStructureFile($tree_file)
*/ */
function setMenuStructureString($tree_string) function setMenuStructureString($tree_string)
{ {
$this->menuStructure = ereg_replace(chr(13), '', $tree_string); // Microsoft Stupidity Suppression $this->menuStructure = preg_replace("/".chr(13)."/", '', $tree_string); // Microsoft Stupidity Suppression
if ($this->menuStructure == '') { if ($this->menuStructure == '') {
$this->error('setMenuStructureString: empty string.'); $this->error('setMenuStructureString: empty string.');
return false; return false;
@ -790,7 +790,7 @@ function _postParse(
for ($cnt=$this->_firstItem[$menu_name]; $cnt<=$this->_lastItem[$menu_name]; $cnt++) { // this counter scans all nodes of the new menu for ($cnt=$this->_firstItem[$menu_name]; $cnt<=$this->_lastItem[$menu_name]; $cnt++) { // this counter scans all nodes of the new menu
$this->tree[$cnt]['child_of_root_node'] = ($this->tree[$cnt]['level'] == 1); $this->tree[$cnt]['child_of_root_node'] = ($this->tree[$cnt]['level'] == 1);
$this->tree[$cnt]['parsed_text'] = stripslashes($this->tree[$cnt]['text']); $this->tree[$cnt]['parsed_text'] = stripslashes($this->tree[$cnt]['text']);
$this->tree[$cnt]['parsed_href'] = (ereg_replace(' ', '', $this->tree[$cnt]['href']) == '') ? '#' : $this->prependedUrl . $this->tree[$cnt]['href']; $this->tree[$cnt]['parsed_href'] = (preg_replace('/ /', '', $this->tree[$cnt]['href']) == '') ? '#' : $this->prependedUrl . $this->tree[$cnt]['href'];
$this->tree[$cnt]['parsed_title'] = ($this->tree[$cnt]['title'] == '') ? '' : ' title="' . stripslashes($this->tree[$cnt]['title']) . '"'; $this->tree[$cnt]['parsed_title'] = ($this->tree[$cnt]['title'] == '') ? '' : ' title="' . stripslashes($this->tree[$cnt]['title']) . '"';
$fooimg = $this->icondir . $this->tree[$cnt]['icon']; $fooimg = $this->icondir . $this->tree[$cnt]['icon'];
if ($this->tree[$cnt]['icon'] != '' && (substr($this->tree[$cnt]['icon'], 0, 7) == 'http://' || substr($this->tree[$cnt]['icon'], 0, 8) == 'https://')) { if ($this->tree[$cnt]['icon'] != '' && (substr($this->tree[$cnt]['icon'], 0, 7) == 'http://' || substr($this->tree[$cnt]['icon'], 0, 8) == 'https://')) {

4
install/install_db_core.inc
View File

@ -158,7 +158,7 @@ class install_db
if(ereg('[(]',$t_s)) if(ereg('[(]',$t_s))
{ {
$ts = split('[(]',$t_s); $ts = preg_split('/[(]/',$t_s);
$type = $ts[0]; $type = $ts[0];
$size = ereg_replace('[)]', '', $ts[1]); $size = ereg_replace('[)]', '', $ts[1]);
$flds[] = Array($field, $type, $size); $flds[] = Array($field, $type, $size);
@ -423,7 +423,7 @@ class install_db
if(ereg('[(]',$t_s)) if(ereg('[(]',$t_s))
{ {
$ts = split('[(]',$t_s); $ts = preg_split('/[(]/',$t_s);
$type = $ts[0]; $type = $ts[0];
$size = ereg_replace('[)]', '', $ts[1]); $size = ereg_replace('[)]', '', $ts[1]);
$flds[] = Array($field, $type, $size); $flds[] = Array($field, $type, $size);

6
modules/account/account.inc.php
View File

@ -212,7 +212,7 @@ class account
#################################################################### ####################################################################
$type = 'add'; $type = 'add';
$this->method["$type"] = split(",", $this->method["$type"]); $this->method["$type"] = preg_split("/,/", $this->method["$type"]);
$arr = $this->method["$type"]; $arr = $this->method["$type"];
include_once(PATH_CORE . 'validate.inc.php'); include_once(PATH_CORE . 'validate.inc.php');
$validate = new CORE_validate; $validate = new CORE_validate;
@ -644,7 +644,7 @@ class account
### Retrieve the record: ### Retrieve the record:
$type = "view"; $type = "view";
$this->method["$type"] = split(",", $this->method["$type"]); $this->method["$type"] = explode(",", $this->method["$type"]);
$db = new CORE_database; $db = new CORE_database;
$db->view($VAR, $this, $type); $db->view($VAR, $this, $type);
@ -843,7 +843,7 @@ class account
### Update the record ### Update the record
$this->account_construct(); $this->account_construct();
$type = "update"; $type = "update";
$this->method["$type"] = split(",", $this->method["$type"]); $this->method["$type"] = explode(",", $this->method["$type"]);
$db = new CORE_database; $db = new CORE_database;
$db->update($VAR, $this, $type); $db->update($VAR, $this, $type);

4
modules/core/auth_generate_admin_menu.inc.php
View File

@ -47,7 +47,7 @@ function auth_generate_admin_menu($menu_obj)
if(empty($meth_arr[2])) if(empty($meth_arr[2]))
$page = $module.':'.$method; $page = $module.':'.$method;
else else
$page = eregi_replace('%%', $module, $meth_arr[2]); $page = preg_replace('/%%/', $module, $meth_arr[2]);
$module_arr[$i]["methods"][] = Array('name' => $method_name, 'page' => $page); $module_arr[$i]["methods"][] = Array('name' => $method_name, 'page' => $page);
@ -71,7 +71,7 @@ function auth_generate_admin_menu($menu_obj)
if(empty($meth_arr[2])) if(empty($meth_arr[2]))
$page = $module.':'.$method; $page = $module.':'.$method;
else else
$page = eregi_replace('%%', $module, $meth_arr[2]); $page = preg_replace('/%%/', $module, $meth_arr[2]);
$module_arr[$i]["sub_methods"][$ii][] = Array('name' => $method_name, 'page' => $page); $module_arr[$i]["sub_methods"][$ii][] = Array('name' => $method_name, 'page' => $page);
} }
} }

2
modules/core/database.inc.php
View File

@ -159,7 +159,7 @@ function sqlConditions( &$db, $Conditions=false, $Tables=false )
$where = " WHERE "; $where = " WHERE ";
if($Conditions) { if($Conditions) {
if(ereg('::', $Conditions) ) { if(preg_match('/::/', $Conditions) ) {
$s = explode('::', $Conditions); $s = explode('::', $Conditions);
$ii=1; $ii=1;
$Conditions = ''; $Conditions = '';

2
modules/core/database_view.inc.php
View File

@ -45,7 +45,7 @@ function CORE_database_view($VAR, &$construct, $type)
if(isset($VAR["id"])) if(isset($VAR["id"]))
{ {
$id = split(',',$VAR["id"]); $id = explode(',',$VAR["id"]);
for($i=0; $i<count($id); $i++) for($i=0; $i<count($id); $i++)
{ {
if($id[$i] != '') if($id[$i] != '')

2
modules/core/method.inc.php
View File

@ -29,7 +29,7 @@ class CORE_method
{ {
if(!empty($VAR['do'][$i])) if(!empty($VAR['do'][$i]))
{ {
if(ereg(":", $VAR['do'][$i])) if(preg_match("/:/", $VAR['do'][$i]))
{ {
$identifier = explode(':',$VAR['do'][$i]); $identifier = explode(':',$VAR['do'][$i]);
$module = $identifier[0]; $module = $identifier[0];

4
modules/core/session.inc.php
View File

@ -187,14 +187,14 @@ class CORE_session
$server = getallheaders(); $server = getallheaders();
$domain = $server['Host']; $domain = $server['Host'];
} }
$domain = '.'.eregi_replace('^www.', '', $domain); $domain = '.'.preg_replace('/^www./', '', $domain);
} }
if(COOKIE_EXPIRE == 0 ) if(COOKIE_EXPIRE == 0 )
$cookie_expire = (time() + 86400*365); $cookie_expire = (time() + 86400*365);
else else
$cookie_expire = (time() + (COOKIE_EXPIRE*60)); $cookie_expire = (time() + (COOKIE_EXPIRE*60));
if(empty($domain) || eregi('localhost', $domain)) if(empty($domain) || preg_match('/localhost/', $domain))
setcookie(COOKIE_NAME,$this->id,$cookie_expire,'/'); setcookie(COOKIE_NAME,$this->id,$cookie_expire,'/');
else else
setcookie(COOKIE_NAME,$this->id,$cookie_expire,'/', $domain); setcookie(COOKIE_NAME,$this->id,$cookie_expire,'/', $domain);

2
modules/core/theme.inc.php
View File

@ -77,7 +77,7 @@ class CORE_theme
$i++; $i++;
} }
} }
$url = ereg_replace('tid=default_admin', '', $url); $url = preg_replace('/tid=default_admin/', '', $url);
$smarty->assign('mainFrameUrl', $url); $smarty->assign('mainFrameUrl', $url);
$this_template = 'file:'.PATH_THEMES.''.THEME_NAME.'/template.tpl'; $this_template = 'file:'.PATH_THEMES.''.THEME_NAME.'/template.tpl';
$smarty->display($this_template); $smarty->display($this_template);

4
modules/core/trigger.inc.php
View File

@ -40,12 +40,12 @@ class CORE_trigger
function run_triggers($trigger) function run_triggers($trigger)
{ {
global $C_method; global $C_method;
$triggers = split(',', $trigger); $triggers = explode(',', $trigger);
for($i=0; $i<count($triggers); $i++) for($i=0; $i<count($triggers); $i++)
{ {
if(isset($triggers[$i])) if(isset($triggers[$i]))
{ {
$triggerss = split(':',$triggers[$i]); $triggerss = explode(':',$triggers[$i]);
# added to remove php error: Undefined offset # added to remove php error: Undefined offset
if(isset($triggerss) && count($triggerss) > 1) if(isset($triggerss) && count($triggerss) > 1)
{ {

2
modules/core/xml.inc.php
View File

@ -65,7 +65,7 @@ class CORE_xml
// new XML to Array for PHP5 and SimpleXML // new XML to Array for PHP5 and SimpleXML
function SimpleXML2Array($xml) { function SimpleXML2Array($xml) {
if (get_class($xml) == 'SimpleXMLElement') { if (is_object($xml) && get_class($xml) == 'SimpleXMLElement') {
$attributes = $xml->attributes(); $attributes = $xml->attributes();
foreach($attributes as $k=>$v) { foreach($attributes as $k=>$v) {
if ($v) $a[$k] = (string) $v; if ($v) $a[$k] = (string) $v;

4
modules/db_mapping/db_mapping.inc.php
View File

@ -356,7 +356,7 @@ class db_mapping
$this->construct(); $this->construct();
$type = "view"; $type = "view";
$this->method["$type"] = split(",", $this->method["$type"]); $this->method["$type"] = explode(",", $this->method["$type"]);
$db = new CORE_database; $db = new CORE_database;
$db->view($VAR, $this, $type); $db->view($VAR, $this, $type);
@ -624,7 +624,7 @@ class db_mapping
{ {
if($file_name != '..' && $file_name != '.') if($file_name != '..' && $file_name != '.')
{ {
$result[$count]['name'] = eregi_replace('.php', '', $file_name); $result[$count]['name'] = preg_replace('/.php/', '', $file_name);
$result[$count]['id'] = $count; $result[$count]['id'] = $count;
### Get the status of this plugin: ### Get the status of this plugin:

2
modules/setup/setup.inc.php
View File

@ -75,7 +75,7 @@ class setup
function view($VAR) function view($VAR)
{ {
$type = "view"; $type = "view";
$this->method["$type"] = split(",", $this->method["$type"]); $this->method["$type"] = explode(",", $this->method["$type"]);
$db = new CORE_database; $db = new CORE_database;
$db->view($VAR, $this, $type); $db->view($VAR, $this, $type);
} }

2
modules/setup/setup_construct.xml
View File

@ -95,7 +95,7 @@
</session_ip_match> </session_ip_match>
<error_reporting> <error_reporting>
<type>C(16)</type> <type>C(16)</type>
<default>0</default> <default>1</default>
</error_reporting> </error_reporting>
<site_name> <site_name>
<type>X</type> <type>X</type>

2
modules/setup/setup_install_data.xml
View File

@ -27,7 +27,7 @@
<date_format><![CDATA[a:4:{i:0;s:1:"m";i:1;s:1:"d";i:2;s:1:"Y";i:3;s:1:"-";}]]></date_format> <date_format><![CDATA[a:4:{i:0;s:1:"m";i:1;s:1:"d";i:2;s:1:"Y";i:3;s:1:"-";}]]></date_format>
<date_time_format><![CDATA[a:1:{i:0;s:0:"";}]]></date_time_format> <date_time_format><![CDATA[a:1:{i:0;s:0:"";}]]></date_time_format>
<decimal_place>2</decimal_place> <decimal_place>2</decimal_place>
<debug>0</debug> <debug>1</debug>
<login_attempt_try>10</login_attempt_try> <login_attempt_try>10</login_attempt_try>
<login_attempt_time>60</login_attempt_time> <login_attempt_time>60</login_attempt_time>
<login_attempt_lock>60</login_attempt_lock> <login_attempt_lock>60</login_attempt_lock>

2
plugins/db_mapping/PostNuke_726.php
View File

@ -198,7 +198,7 @@ class map_POSTNUKE_726
function sync($id, $file) function sync($id, $file)
{ {
$db_map = new db_mapping; $db_map = new db_mapping;
$this = $db_map->MAP_sync ($id, $file, $this); $this &= $db_map->MAP_sync ($id, $file, $this);
} }

2
plugins/db_mapping/osCommerce_22.php
View File

@ -187,7 +187,7 @@ class map_OSCOMMERCE_22
function sync($id, $file) function sync($id, $file)
{ {
$db_map = new db_mapping; $db_map = new db_mapping;
$this = $db_map->MAP_sync ($id, $file, $this); $db_map->MAP_sync ($id, $file, $this);
} }