admin/cacti
1
0 Fork 0
mirror of https://github.com/Cacti/cacti.git synced 2026-11-08 21:16:17 +09:00
Code Issues Packages Projects Releases Wiki Activity
3,985 Commits 73 Branches 85 Tags
cb599443e5ea71d9331bf3c4230f4e9c8a0e69e7
Commit Graph
100 Commits
Author SHA1 Message Date
Jimmy Conner efb572d79f Patch for SSL/TLS in PHPMailer 
also fix the bullet_arrow images

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7616 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-27 05:25:44 +00:00
Jimmy Conner 313a24f568 Remove MYSQL_ATTR_FOUND_ROWS 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7610 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-25 18:23:34 +00:00
Jimmy Conner bf1046a437 Add back in line accidentally removed earlier 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7595 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-24 02:05:57 +00:00
Jimmy Conner 0358e37ce9 More Q/A and cleanup of the database functions 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7591 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-23 18:22:30 +00:00
Jimmy Conner 15bc773c89 Add authentication cookies 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7589 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-23 04:49:29 +00:00
Jimmy Conner 10348ee7b4 Quick fix for db_execute on invalid queries 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7588 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-23 04:39:35 +00:00
Jimmy Conner f99e1d33e8 Better fix for affected rows (PDO really needs a better method) 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7587 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-22 06:06:13 +00:00
Jimmy Conner dbce81125c Need to return the connection for plugins that use a separate DB. I would rather they were passing the db name instead, but it would break too many things at this point. 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7586 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-22 05:04:29 +00:00
Jimmy Conner e038586bbb Create quick functions for prepared statements. 
I had originally added in caching of the prepared resource, and reusing it instead calling prepare again, but from what I have found, MySQL is caching the result anyways, so there is no real difference.

I would like to find a way to combine these with the original functions without causing backward compatibility problems.  I will see what I can come up with.

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7581 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-19 08:34:36 +00:00
Jimmy Conner 6d51ed791d Change database.php to utilize PDO functions 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7580 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-19 06:32:59 +00:00
Jimmy Conner 04340b729b 1) Correct issue in _db_replace not handling primary keys correctly 
2) Fix undefined variable in lib/tree.php
3) Properly copy and add users and their permissions
4) Move about/login/logout/permission images into CSS for themes
5) Remember my last settings tabs between refreshes
6) Only show Boost specifics when checked
7) Remove DOS eol's in database.php

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7574 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-18 05:33:42 +00:00
Jimmy Conner 47de436a96 Backport database.php from Main as a starting point. 
We will then begin to move to utilizing the PDO library (unless we vote otherwise).
ADODB is being left included for now until I can rewrite the Syslog plugin.


git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7573 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-17 06:31:32 +00:00
Jimmy Conner ac6d6929cc Remove some unnecessary ending PHP closing tags 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7571 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-17 03:02:03 +00:00
Jimmy Conner af5d8d40df Add the complete backtrace, makes it super simple to track down where issues are originating from 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7562 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-12 05:32:49 +00:00
Jimmy Conner b159662d45 When logging DB Errors, display which function was last called to help track it down. 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7561 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-12 04:51:24 +00:00
Tony Roman 65be30ffe0 Update copyright to 2014 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7437 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-03-30 19:54:50 +00:00
Tony Roman ce40281901 Update copyright to 2013 for 0.8.8 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7386 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2013-07-21 23:00:42 +00:00
Tony Roman a257958a0b Update copyright to 2012 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@7016 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2012-02-27 07:04:37 +00:00
Reinhard Scheck 14a04ccd12 fix description, no code change! 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6908 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2011-11-13 11:01:26 +00:00
Larry Adams 986a673266 0002086: incorrect usage of mysql custom tcp port in 0.8.7h 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6907 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2011-11-12 18:00:09 +00:00
Larry Adams 03ea0b6488 -bug#0002080: Database password containing "@" does not connect 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6870 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2011-10-21 11:45:53 +00:00
Larry Adams 13ab8d58dd -bug#0001646: [patch] MySQL SSL connection support 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6321 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2011-02-21 02:04:10 +00:00
Tony Roman 9acba795fe Update copyright to 2011 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6233 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2011-01-27 03:44:05 +00:00
Larry Adams d069f29d8d QA: Replace result is more relative here. 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6095 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2010-08-12 00:04:09 +00:00
Larry Adams a092beea04 -bug#0001781: MySQL error messages after upgrade to 0.8.7g-beta1 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6094 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2010-08-11 12:49:13 +00:00
Larry Adams 75da7d124d -bug#0001776: Cacti Support for Multiple Simultaneous Databases Broken 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5978 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2010-06-05 20:40:46 +00:00
Reinhard Scheck 40545c1cad honour DEVEL debug mode 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5958 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2010-05-29 10:32:49 +00:00
Larry Adams c5403f3844 QA: Update copyrights 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5806 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2010-04-28 03:48:09 +00:00
Reinhard Scheck 810e86cc15 backport of latest changes to array_to_sql_or 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5771 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2010-04-19 19:47:18 +00:00
Reinhard Scheck 1171bd413c enhance database logging on save 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5769 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2010-04-19 17:40:24 +00:00
Reinhard Scheck d07f9c0d42 some more parenthesis required 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5355 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2009-11-03 19:29:32 +00:00
Larry Adams 408230fbe5 QA: Correct my bloody mistake. 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5342 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2009-10-17 18:03:32 +00:00
Larry Adams 3975536fe1 git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5305 860744bd-22fc-0310-8c96-e9fe5004b5ca 2009-09-25 01:11:28 +00:00
Tony Roman 26d1957d62 Update copyright to 2009 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4931 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2009-02-11 22:53:50 +00:00
Larry Adams 6bc5250219 -bug: Correct missing db_conn argument passing issue. 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4911 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2009-02-08 09:24:03 +00:00
Larry Adams 8e9f63ef38 -feature: Add developer debug level to reduce SQL messages in DEBUG 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4810 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2008-11-12 17:45:20 +00:00
Larry Adams c5a2d1b950 -feature: Exit is either a database or table does not exist 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4808 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2008-11-12 12:40:43 +00:00
Larry Adams 8a828d7669 -bug#0001294: Stack overflow if database is not correctly initialized 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4720 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2008-09-17 23:27:55 +00:00
Larry Adams 2c31003160 -feature: support using the cacti database api with more than one connection 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4565 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2008-04-06 00:20:46 +00:00
Larry Adams 22f9e12ddb Update Copyright Notice for 2008. 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4434 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2008-01-29 00:40:43 +00:00
Larry Adams 9d6a8451e4 -bug#0001118: Graph Generation fails if e.g. ifDescr contains some blanks 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4381 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-12-15 23:43:22 +00:00
Tony Roman 6a2e04bf41 Bug#0000997: Graph template edit problem with Cacti 0.8.7 beta 1 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/main@4148 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-09-11 03:17:50 +00:00
Larry Adams 1a7a839b73 Place escaping in the main Cacti SQLSave function to secure code. 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@4131 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-09-08 20:28:34 +00:00
Larry Adams 6084c0a67c -feature: some sql errors are not errors at all. 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@4109 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-09-02 23:34:21 +00:00
Larry Adams 299dde0ac5 correct issues related to db disconnects between polls. 
correct memory consumption issues with ADODB.

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@4067 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-08-12 15:49:35 +00:00
Larry Adams 8397da68ff Add additional logging to SQL Calls 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@4066 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-08-12 15:15:55 +00:00
Larry Adams c9a003abe6 QA work relative to UI & Database performance, make the SQL output look nicer in the MySQL Slow Query Log. 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@4001 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-06-29 02:17:52 +00:00
Larry Adams 866c63a488 Add INNODB support. 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3987 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-06-25 16:41:50 +00:00
Jimmy Conner b5e7d721d3 Switch log_verbosity to use a cached value (cuts our SQL queries in half), and reset the cache every page load so we can do on the fly changes again 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3971 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-06-12 14:00:06 +00:00
Larry Adams e27c5a75b7 better notification of issues. 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3925 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-05-22 03:21:19 +00:00