Skip to content

Commit

Permalink
merged from master
Browse files Browse the repository at this point in the history
  • Loading branch information
Joel Wan committed Jan 25, 2013
2 parents 42bcbce + 01ccfbb commit 8531818
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 28 deletions.
21 changes: 16 additions & 5 deletions index.php
Expand Up @@ -4,7 +4,7 @@
* @link http://www.phpobjectgenerator.com * @link http://www.phpobjectgenerator.com
* @copyright Offered under the BSD license * @copyright Offered under the BSD license
* @abstract Php Object Generator automatically generates clean and tested Object Oriented code for your PHP4/PHP5 application. * @abstract Php Object Generator automatically generates clean and tested Object Oriented code for your PHP4/PHP5 application.
* LIVE SITE # * LIVE SITE
*/ */
include "./include/class.misc.php"; include "./include/class.misc.php";
include "./include/configuration.php"; include "./include/configuration.php";
Expand All @@ -24,8 +24,11 @@
} }
if ($misc->GetVariable('attributeList') != null) if ($misc->GetVariable('attributeList') != null)
{ {
if (isset($_GET['attributeList'])) if (isset($_GET['attributeList'])) {
$attributeList = stripcslashes(urldecode($_GET['attributeList'])); $attArray = stripcslashes(urldecode($_GET['attributeList']));
$attArray = trim(preg_replace('#^array\s*\(|\d\s\=\>\s*\'|\'\,\s*\)$#', '', $attArray));
$attributeList = preg_split('#\'\s*,\s*#', $attArray);
}
else else
@$attributeList=unserialize($_SESSION['attributeList']); @$attributeList=unserialize($_SESSION['attributeList']);
} }
Expand All @@ -41,7 +44,9 @@
{ {
$typeList = urldecode($_GET['typeList']); $typeList = urldecode($_GET['typeList']);
} }
$typeList = trim($typeList); $typeArray = trim($typeList);
$typeArray = trim(preg_replace('#^array\s*\(|\d\s\=\>\s*\'|\'\,\s*\)$#', '', $typeArray));
$typeList = preg_split('#\'\s*,\s*#', $typeArray);
for($i=0; $i<sizeof($typeList); $i++) for($i=0; $i<sizeof($typeList); $i++)
{ {
$typeList[$i] = stripcslashes($typeList[$i]); $typeList[$i] = stripcslashes($typeList[$i]);
Expand All @@ -59,9 +64,15 @@
if ($misc->GetVariable('classList') != null) if ($misc->GetVariable('classList') != null)
{ {
if (isset($_GET['classList'])) if (isset($_GET['classList']))
$classList = stripcslashes(urldecode($_GET['classList'])); {
$classArray = stripcslashes(urldecode($_GET['classList']));
$classArray = trim(preg_replace('#^array\s*\(|\d\s\=\>\s*\'|\'\,\s*\)$#', '', $classArray));
$classList = preg_split('#\'\s*,\s*#', $classArray);
}
else else
{
@$classList=unserialize($_SESSION['classList']); @$classList=unserialize($_SESSION['classList']);
}
} }


$pdoDriver = ($misc->GetVariable('pdoDriver')!=null?$misc->GetVariable('pdoDriver'):'mysql'); $pdoDriver = ($misc->GetVariable('pdoDriver')!=null?$misc->GetVariable('pdoDriver'):'mysql');
Expand Down
21 changes: 0 additions & 21 deletions local_46888.xml
@@ -1,31 +1,10 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<Links> <Links>
<Link>
<LinkID>OI87827</LinkID>
<URL>http://www.forumla.de/archive/index.php/f-30.html</URL>
<Text>PS3 Community - Forumla.de</Text>
<BeforeText> </BeforeText>
<AfterText> </AfterText>
</Link>
<Link>
<LinkID>OI319561</LinkID>
<URL>http://www.superwarehouse.com/Sony_Laptops/b/250/c/14</URL>
<Text>Sony Laptops</Text>
<BeforeText> </BeforeText>
<AfterText> </AfterText>
</Link>
<Link> <Link>
<LinkID>OI469063</LinkID> <LinkID>OI469063</LinkID>
<URL>http://www.canadianwebhosting.com/domain_hosting.asp</URL> <URL>http://www.canadianwebhosting.com/domain_hosting.asp</URL>
<Text>domain hosting</Text> <Text>domain hosting</Text>
<BeforeText> </BeforeText> <BeforeText> </BeforeText>
<AfterText> </AfterText> <AfterText> </AfterText>
</Link> </Link>
<Link>
<LinkID>OI576934</LinkID>
<URL>http://www.facebook.com/FisherInvestmentsMarketMinder</URL>
<Text>Market Minder on Facebook</Text>
<BeforeText> </BeforeText>
<AfterText> </AfterText>
</Link>
</Links> </Links>
2 changes: 1 addition & 1 deletion regenerate.php
Expand Up @@ -57,7 +57,7 @@
} }
else else
{ {
$_SESSION[$arguments[0]] = $value; eval ("\$_SESSION['".$arguments[0]."'] = '".$value."';");
} }
} }
if (!isset($pdoDrive)) if (!isset($pdoDrive))
Expand Down
2 changes: 1 addition & 1 deletion services/soap_php5.php
Expand Up @@ -289,7 +289,7 @@ function GeneratePackageFromLink($link)
} }
else else
{ {
$$arguments[0] = $value; eval ("$".$arguments[0]." = '".$value."';");
} }
if (!isset($pdoDrive)) if (!isset($pdoDrive))
{ {
Expand Down

0 comments on commit 8531818

Please sign in to comment.