Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: rodbegbie/threequarters
base: 7790ef837f
...
head fork: rodbegbie/threequarters
compare: 8ca271320b
  • 2 commits
  • 36 files changed
  • 0 commit comments
  • 1 contributor
Showing with 65 additions and 49 deletions.
  1. +12 −6 htdocs/mint/app/lib/mint.php
  2. +1 −1  htdocs/mint/app/lib/pepper.php
  3. +1 −1  htdocs/mint/app/path.php
  4. +1 −1  htdocs/mint/app/paths/auth/index.php
  5. +1 −1  htdocs/mint/app/paths/auth/login.php
  6. +1 −1  htdocs/mint/app/paths/custom/index.php
  7. +1 −1  htdocs/mint/app/paths/display/display.php
  8. +1 −1  htdocs/mint/app/paths/display/index.php
  9. +1 −1  htdocs/mint/app/paths/errors/index.php
  10. +1 −1  htdocs/mint/app/paths/feedback/index.php
  11. +1 −1  htdocs/mint/app/paths/install/activation.php
  12. +1 −1  htdocs/mint/app/paths/install/configuration.php
  13. +1 −1  htdocs/mint/app/paths/install/eula.php
  14. +1 −1  htdocs/mint/app/paths/install/index.php
  15. +1 −1  htdocs/mint/app/paths/install/instructions.php
  16. +1 −1  htdocs/mint/app/paths/preferences/index.php
  17. +1 −1  htdocs/mint/app/paths/preferences/preferences.php
  18. +2 −2 htdocs/mint/app/paths/record/index.php
  19. +1 −1  htdocs/mint/app/paths/record/js.php
  20. +1 −1  htdocs/mint/app/paths/uninstall/index.php
  21. +1 −1  htdocs/mint/app/paths/uninstall/uninstall.php
  22. +1 −1  htdocs/mint/app/paths/util/gateway.php
  23. +1 −1  htdocs/mint/app/paths/util/import.php
  24. +1 −1  htdocs/mint/app/paths/util/index.php
  25. +1 −1  htdocs/mint/app/paths/util/info.php
  26. +1 −1  htdocs/mint/app/paths/util/recover.php
  27. +1 −1  htdocs/mint/app/paths/util/visits.php
  28. +1 −1  htdocs/mint/app/styles/iepc.css
  29. +1 −1  htdocs/mint/config/auto.php
  30. +1 −1  htdocs/mint/config/db.php
  31. +1 −1  htdocs/mint/index.php
  32. +2 −2 htdocs/mint/pepper/shauninman/backuprestore/class.php
  33. +3 −3 htdocs/mint/pepper/shauninman/default/class.php
  34. +2 −4 htdocs/mint/pepper/shauninman/default/engines.php
  35. +6 −2 htdocs/mint/pepper/shauninman/iphone/class.php
  36. +9 −1 htdocs/mint/pepper/shauninman/useragent007/class.php
18 htdocs/mint/app/lib/mint.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
@@ -14,7 +14,7 @@
class Mint
{
- var $version = 218;
+ var $version = 219;
var $db = array
(
'server' => 'localhost',
@@ -191,6 +191,11 @@ function _makeConnection()
$this->logBenchmark('}');
return $connected;
}
+
+ function dbEngine()
+ {
+ return (mysql_get_client_info() > 4) ? 'ENGINE' : 'TYPE';
+ }
/**************************************************************************
query()
@@ -1067,9 +1072,10 @@ function install()
$this->cfg['version'] = $this->version;
- $this->query("CREATE TABLE `{$this->db['tblPrefix']}_config` (`id` int(10) unsigned NOT NULL auto_increment, `cfg` MEDIUMTEXT NOT NULL, `data` MEDIUMTEXT NOT NULL, PRIMARY KEY (`id`)) TYPE=MyISAM;");
+ $dbEngine = $this->dbEngine();
+ $this->query("CREATE TABLE `{$this->db['tblPrefix']}_config` (`id` int(10) unsigned NOT NULL auto_increment, `cfg` MEDIUMTEXT NOT NULL, `data` MEDIUMTEXT NOT NULL, PRIMARY KEY (`id`)) {$dbEngine}=MyISAM;");
$this->query("INSERT INTO `{$this->db['tblPrefix']}_config` VALUES (1, '".addslashes(serialize($this->cfg))."', '')");
- $this->query("CREATE TABLE `{$this->db['tblPrefix']}visit` (`id` int(11) unsigned NOT NULL auto_increment, `dt` int(10) unsigned NOT NULL default '0', PRIMARY KEY (`id`), KEY `dt` (`dt`)) TYPE=MyISAM;");
+ $this->query("CREATE TABLE `{$this->db['tblPrefix']}visit` (`id` int(11) unsigned NOT NULL auto_increment, `dt` int(10) unsigned NOT NULL default '0', PRIMARY KEY (`id`), KEY `dt` (`dt`)) {$dbEngine}=MyISAM;");
// Install the required Default Pepper first
$this->installPepper('pepper/shauninman/default/class.php');
@@ -1467,7 +1473,7 @@ function syncManifest($pepperId, $pepperManifest, $pepperModerate)
}
}
- $queryTail .= ") TYPE=MyISAM;";
+ $queryTail .= ') '.$this->dbEngine().'=MyISAM;';
$query .= implode(', ', $addColumns).$queryTail;
// Add the table to the manifest
@@ -3559,7 +3565,7 @@ function abbr($var, $len = 44, $reverse = false)
}
else
{
- if (preg_match("/^(.{1,$len})(\s|\/|\?|&|_|-)./ms", $var, $match))
+ if (preg_match("/^((&[^;]+;|.){1,$len})(\s|\/|\?|&|_|-)./ms", $var, $match))
{
$abbr = "<abbr title=\"$var\">".str_replace('?', '<wbr />?', $match[1])."&#8230;</abbr>";
}
2  htdocs/mint/app/lib/pepper.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/path.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/auth/index.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/auth/login.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/custom/index.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/display/display.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/display/index.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/errors/index.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/feedback/index.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/install/activation.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/install/configuration.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/install/eula.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/install/index.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/install/instructions.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/preferences/index.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/preferences/preferences.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
4 htdocs/mint/app/paths/record/index.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
@@ -46,5 +46,5 @@
echo '/*Minted*/';
}
}
-mysql_close();
+// mysql_close(); // crashes PHP 5.3
?>
2  htdocs/mint/app/paths/record/js.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/uninstall/index.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/uninstall/uninstall.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/util/gateway.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/util/import.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/util/index.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/util/info.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/util/recover.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/paths/util/visits.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/app/styles/iepc.css
View
@@ -1,7 +1,7 @@
/******************************************************************************
Mint CSS for IE PC
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/config/auto.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/config/db.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
2  htdocs/mint/index.php
View
@@ -2,7 +2,7 @@
/******************************************************************************
Mint
- Copyright 2004-2010 Shaun Inman. This code cannot be redistributed without
+ Copyright 2004-2011 Shaun Inman. This code cannot be redistributed without
permission from http://www.shauninman.com/
More info at: http://www.haveamint.com/
4 htdocs/mint/pepper/shauninman/backuprestore/class.php
View
@@ -13,7 +13,7 @@
class SI_BackUpRestore extends Pepper
{
- var $version = 201;
+ var $version = 202;
var $info = array
(
'pepperName' => 'Backup/Restore',
@@ -223,7 +223,7 @@ function makeBackup()
{
// Create the _config_only table
$tableName = "{$prefix}{$this->Mint->db['tblPrefix']}_config_only";
- $this->query("CREATE TABLE `$tableName` (`id` int(10) unsigned NOT NULL auto_increment, `cfg` text NOT NULL, PRIMARY KEY (`id`)) TYPE=MyISAM;");
+ $this->query("CREATE TABLE `$tableName` (`id` int(10) unsigned NOT NULL auto_increment, `cfg` text NOT NULL, PRIMARY KEY (`id`)) ".$this->Mint->dbEngine()."=MyISAM;");
$this->query("INSERT INTO `$tableName` VALUES (1, '".addslashes(serialize($this->Mint->cfg))."')");
}
else
6 htdocs/mint/pepper/shauninman/default/class.php
View
@@ -13,7 +13,7 @@
class SI_Default extends Pepper
{
- var $version = 210;
+ var $version = 208;
var $info = array
(
'pepperName' => 'Default',
@@ -368,7 +368,7 @@ function onRecord()
}
}
// Google Images slips through entirely, because its q var is encoded in the prev var (propbably used in the "Image Results" link)
- else if (strpos($referer, 'google.') !== false && preg_match('!prev=([^&]+)!i', html_entity_decode($referer), $p))
+ else if (strpos($referer, 'images.google.') !== false && preg_match('!prev=([^&]+)!i', html_entity_decode($referer), $p))
{
if (!empty($p[1]) && preg_match('!q=([^&]+)!i', urldecode($p[1]), $q))
{
@@ -678,7 +678,7 @@ function manageWatchedPages($action = '', $resource = '')
if ($action == 'watch')
{
- if (!in_array($resource,$watched))
+ if (!in_array($resource, $watched))
{
$watched[] = $resource;
}
6 htdocs/mint/pepper/shauninman/default/engines.php
View
@@ -13,7 +13,7 @@
'url' => 'http://www.google.com/search',
'domain' => 'google',
'query' => 'q|as_q',
- 'images' => '/images',
+ 'images' => 'images.google',
'image_results' => '/images?q='
);
$SI_SearchEngines[] = array
@@ -39,9 +39,7 @@
'name' => 'Bing',
'url' => 'http://www.bing.com/search',
'domain' => 'bing',
- 'query' => 'q',
- 'images' => '/images/',
- 'image_results' => '/images/search?q='
+ 'query' => 'q'
);
$SI_SearchEngines[] = array
(
8 htdocs/mint/pepper/shauninman/iphone/class.php
View
@@ -23,7 +23,7 @@ function SI_iPhone_obNoScroll($buffer)
class SI_iPhone extends Pepper
{
- var $version = 121;
+ var $version = 122;
var $info = array
(
'pepperName' => 'iPhone',
@@ -95,7 +95,11 @@ function update()
**************************************************************************/
function onPepperLoad()
{
- $this->isiPhone = (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strpos($_SERVER['HTTP_USER_AGENT'], 'iPod')) !== false);
+ $this->isiPhone = (isset($_SERVER['HTTP_USER_AGENT']) && (
+ strpos($_SERVER['HTTP_USER_AGENT'], 'iPhone') ||
+ strpos($_SERVER['HTTP_USER_AGENT'], 'iPod') ||
+ strpos($_SERVER['HTTP_USER_AGENT'], 'Android')
+ ) !== false);
if ($this->isiPhone)
{
10 htdocs/mint/pepper/shauninman/useragent007/class.php
View
@@ -13,7 +13,7 @@
class SI_UserAgent extends Pepper
{
- var $version = 208;
+ var $version = 209;
var $info = array
(
'pepperName' => 'User Agent 007',
@@ -962,6 +962,14 @@ function parseUserAgent($user_agent)
$ua['version'] = $v[1];
}
}
+
+ // this seems to be an evolving standard for reporting the actual
+ // application version rather than the rendering engine version
+ // current implemented by Safari and Opera
+ if (preg_match('/Version\/([.0-9]+)/i', $user_agent, $m))
+ {
+ $ua['version'] = $m[1];
+ }
return $ua;
}
}

No commit comments for this range

Something went wrong with that request. Please try again.