Some constants for the btc addr, email and site url..

+ missing .gitignore / folder git keepers

.gitignore

@@ -0,0 +1,7 @@
+*.o
+*.a
+stratum/stratum
+stratum/blocknotify
+*.log
+web/yaamp/runtime/*
+

README.md

@@ -1,8 +1,8 @@
-#yaamp
+#yiimp - yaamp fork
 
 Required:
 
-	linux, mysql, php, web engine, memcached
+	linux, mysql, php, memcached
 
 Config for nginx:
 
@@ -20,7 +20,7 @@ Config for nginx:
 		include fastcgi_params;
 	}
 
-If you use apache, it should be something like:
+If you use apache, it should be something like (set in web/.htaccess):
 
 	RewriteEngine on
 
@@ -57,7 +57,7 @@ All your coin's config files need to blocknotify their corresponding stratum usi
 
 	blocknotify=/var/stratum/blocknotify yaamp.com:port coinid %s
 
-On the website, go to http://server.com/site/frottedessus to login as admin. You have to change it to something different in the code (web/yaamp/modules/site/SiteController.php).
+On the website, go to http://server.com/site/admintest to login as admin. You have to change it to something different in the code (web/yaamp/modules/site/SiteController.php).
 
 There are logs generated in the /var/stratum folder and /var/log/stratum/debug.log for the php log.
 

blocknotify/Makefile

@@ -0,0 +1,25 @@
+
+CC=gcc
+
+CFLAGS=-c -g -I /usr/include/mysql -march=native
+LDFLAGS=-g
+
+#CFLAGS=-c -O2 -I /usr/include/mysql
+#LDFLAGS=-O2
+
+LDLIBS=-lstdc++
+
+SOURCES=blocknotify.cpp
+
+OBJECTS=$(SOURCES:.cpp=.o)
+OUTPUT=blocknotify
+
+all: $(SOURCES) $(OUTPUT)
+
+install: all
+	strip -s $(OUTPUT)
+	cp $(OUTPUT) /usr/local/bin/
+
+clean:
+	rm -f *.o
+	rm -f $(OUTPUT)

stratum/makefile

@@ -1,53 +0,0 @@
-
-CC=gcc
-
-CFLAGS=-c -g -I /usr/include/mysql
-LDFLAGS=-g
-
-#CFLAGS=-c -O2 -I /usr/include/mysql
-#LDFLAGS=-O2
-
-LDLIBS=iniparser/libiniparser.a algos/libalgos.a sha3/libhash.a -lmysqlclient -lpthread -lm -lstdc++
-
-SOURCES=stratum.cpp db.cpp coind.cpp coind_aux.cpp coind_template.cpp coind_submit.cpp util.cpp list.cpp \
-	rpc.cpp job.cpp job_send.cpp job_core.cpp merkle.cpp share.cpp socket.cpp coinbase.cpp \
-	client.cpp client_submit.cpp client_core.cpp client_difficulty.cpp remote.cpp remote_template.cpp \
-	user.cpp object.cpp json.cpp base58.cpp 
-
-OBJECTS=$(SOURCES:.cpp=.o)
-OUTPUT=stratum
-
-CODEDIR1=algos
-CODEDIR2=sha3
-
-.PHONY: projectcode1 projectcode2
-
-all: projectcode1 projectcode2 $(SOURCES) $(OUTPUT)
-
-projectcode1:
-	$(MAKE) -C $(CODEDIR1)
-
-projectcode2:
-	$(MAKE) -C $(CODEDIR2)
-
-$(SOURCES): stratum.h util.h
-
-$(OUTPUT): $(OBJECTS) 
-	$(CC) $(LDFLAGS) $(OBJECTS) $(LDLIBS) -o $@
-	
-.cpp.o:
-	$(CC) $(CFLAGS) $<
-	
-.c.o:
-	$(CC) $(CFLAGS) $<
-
-clean:
-	rm *.o
-#	rm algos/*.o
-#	rm sha3/*.o
-
-install: all
-	cp stratum release
-	strip release/stratum
-
-	

web/.htaccess

@@ -0,0 +1,10 @@
+RewriteEngine On
+
+#RewriteCond %{REQUEST_FILENAME} -s [OR]
+#RewriteCond %{REQUEST_FILENAME} -l [OR]
+#RewriteCond %{REQUEST_FILENAME} -d
+#RewriteRule ^.*$ - [NC,L]
+#RewriteRule ^.*$ index.php [NC,L]
+
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^(.*) index.php?r=$1 [QSA]

web/.project

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>web</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.dltk.core.scriptbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.php.core.PHPNature</nature>
-	</natures>
-</projectDescription>

web/framework-1.0.8/base/CErrorHandler.php

@@ -295,7 +295,7 @@ class CErrorHandler extends CApplicationComponent
 	{
 		if(YII_DEBUG)
 		{
-			$version='<a href="http://yaamp.com/">yaamp.com</a>';
+			$version='<a href="http://yiimp.ccminer.org/">yiimp.ccminer.org</a>';
 			if(isset($_SERVER['SERVER_SOFTWARE']))
 				$version=$_SERVER['SERVER_SOFTWARE'].' '.$version;
 		}

web/index.php

@@ -1,11 +1,15 @@
 <?php
 
+//define('YII_DEBUG', true);
+
 require_once('serverconfig.php');
 require_once('yaamp/ui/app.php');
 
 if(isset($_SERVER['HTTP_X_FORWARDED_FOR']))
 	$_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
 
+//$_SERVER['PATH_INFO'] = $_SERVER['REQUEST_URI'];
+
 if(0)
 {
 	debuglog("{$_SERVER['REMOTE_ADDR']}, {$_SERVER['REQUEST_URI']}");

web/serverconfig.php

@@ -1,26 +0,0 @@
-<?php
-
-ini_set('date.timezone', 'Canada/Eastern');
-
-define('YAAMP_LOGS', '/var/log/yaamp');
-define('YAAMP_HTDOCS', '/var/web');
-
-define('YAAMP_DBHOST', 'localhost');
-define('YAAMP_DBNAME', 'yaamp');
-define('YAAMP_DBUSER', 'root');
-define('YAAMP_DBPASSWORD', 'password');
-
-define('YAAMP_PRODUCTION', true);
-define('YAAMP_RENTAL', true);
-define('YAAMP_LIMIT_ESTIMATE', false);
-
-define('YAAMP_FEES_MINING', 0.5);
-define('YAAMP_FEES_EXCHANGE', 2);
-define('YAAMP_FEES_RENTING', 2);
-define('YAAMP_PAYMENTS_FREQ', 3*60*60);
-
-$cold_wallet_table = array(
-	'1C23KmLeCaQSLLyKVykHEUse1R7jRDv9j9' => 0.10,
-);
-
-

web/serverconfig.php

@@ -0,0 +1 @@
+/etc/yamp/serverconfig.php

web/serverconfig.sample.php

@@ -0,0 +1,30 @@
+<?php
+
+ini_set('date.timezone', 'Canada/Eastern');
+
+define('YAAMP_LOGS', '/var/log/yaamp');
+define('YAAMP_HTDOCS', '/var/web');
+
+define('YAAMP_DBHOST', 'localhost');
+define('YAAMP_DBNAME', 'yaamp');
+define('YAAMP_DBUSER', 'root');
+define('YAAMP_DBPASSWORD', 'password');
+
+define('YAAMP_PRODUCTION', true);
+define('YAAMP_RENTAL', true);
+define('YAAMP_LIMIT_ESTIMATE', false);
+
+define('YAAMP_FEES_MINING', 0.5);
+define('YAAMP_FEES_EXCHANGE', 2);
+define('YAAMP_FEES_RENTING', 2);
+define('YAAMP_PAYMENTS_FREQ', 3*60*60);
+
+define('YAAMP_BTCADDRESS', '1Auhps1mHZQpoX4mCcVL8odU81VakZQ6dR');
+define('YAAMP_SITE_URL', 'yiimp.ccminer.org');
+define('YAAMP_ADMIN_EMAIL', 'yiimp@spam.la');
+
+$cold_wallet_table = array(
+	'1C23KmLeCaQSLLyKVykHEUse1R7jRDv9j9' => 0.10,
+);
+
+

web/yaamp/config.php

@@ -1,7 +1,7 @@
 <?php
 
 return array(
-	'name'=>'yaamp.com',
+	'name'=>YAAMP_SITE_URL,
 
 	'defaultController'=>'site',
 	'layout'=>'main',
@@ -21,6 +21,12 @@ return array(
 			'urlFormat'=>'path',
 			'showScriptName'=>false,
 			'appendParams'=>false,
+			'caseSensitive'=>false,
+			'rules'=>array(
+				'<controller:\w+>/<id:\d+>'=>'<controller>/view',
+				'<controller:\w+>/<action:\w+>/<id:\d+>'=>'<controller>/<action>',
+				'<controller:\w+>/<action:\w+>'=>'<controller>/<action>',
+			),
 		),
 
 		'assetManager'=>array(
@@ -32,7 +38,7 @@ return array(
 				array(
 					'class'=>'CFileLogRoute',
 					'levels'=>'error, warning',
-				//	'levels'=>'trace, error, warning',
+//					'levels'=>'debug, trace, error, warning',
 				),
 //				array(
 //					'class'=>'CProfileLogRoute',

web/yaamp/core/backend/blocks.php

@@ -226,7 +226,7 @@ function MonitorBTC()
 		
 		$txurl = "https://blockchain.info/tx/{$transaction['txid']}";
 		
-		$b = mail('yaamp201@gmail.com', "withdraw {$transaction['amount']}", 
+		$b = mail(YAAMP_ADMIN_EMAIL, "withdraw {$transaction['amount']}", 
 			"<a href='$txurl'>{$transaction['address']}</a>");
 		
 		if(!$b) debuglog('error sending email');

web/yaamp/core/backend/rawcoins.php

@@ -96,7 +96,7 @@ function updateRawCoin($marketname, $symbol, $name='unknown')
 		$coin->created = time();
 		$coin->save();
 		
-		mail('yaamp201@gmail.com', "New coin $symbol", "new coin $symbol ($name) on $marketname");
+		mail(YAAMP_ADMIN_EMAIL, "New coin $symbol", "new coin $symbol ($name) on $marketname");
 		sleep(30);
 	}
 	

web/yaamp/core/backend/services.php

@@ -10,12 +10,16 @@ function BackendUpdateServices()
 		2=>'scryptn',
 		3=>'x11',
 		4=>'x13',
+		5=>'keccak',
 		6=>'x15',
 		7=>'nist5',
 		8=>'neoscrypt',
 		9=>'lyra2',
+		10=>'whirlx',
 		11=>'qubit',
 		12=>'quark',
+
+		111=>'c11',
 	);
 
 	$res = fetch_url('https://www.nicehash.com/api?method=stats.global.current');

web/yaamp/core/backend/system.php

@@ -242,7 +242,7 @@ function BackendRunCoinActions()
 // 	fclose($file);
 	
 // 	controller()->memcache->set('stratum_log_size', $filesize);
-// 	system("echo \"$data\" | mail -s \"yaamp server\" yaamp201@gmail.com");
+// 	system("echo \"$data\" | mail -s \"yiimp server\" ".YAAMP_ADMIN_EMAIL);
 }
 
 

web/yaamp/core/common/Shortcuts.php

@@ -36,7 +36,7 @@ function bu($url=null)
 {
 	static $baseUrl;
 	if ($baseUrl===null)
-	$baseUrl=Yii::app()->request->baseUrl;
+		$baseUrl=Yii::app()->request->baseUrl;
 	return $url===null ? $baseUrl : $baseUrl.'/'.ltrim($url,'/');
 }
 

web/yaamp/core/common/system.php

@@ -7,9 +7,9 @@ function send_email_alert($name, $title, $message, $t=10)
 	$last = memcache_get(controller()->memcache->memcache, "last_email_sent_$name");
 	if($last + $t*60 > time()) return;
 
-	debuglog("mail('yaamp201@gmail.com', $title, ...)");
+	debuglog("mail('".YAAMP_ADMIN_EMAIL."', $title, ...)");
 	
-	$b = mail('yaamp201@gmail.com', $title, $message);
+	$b = mail(YAAMP_ADMIN_EMAIL, $title, $message);
 	if(!$b) debuglog('error sending email');
 	
 	memcache_set(controller()->memcache->memcache, "last_email_sent_$name", time());

web/yaamp/core/exchange2/CExchange.php

@@ -177,14 +177,15 @@ class CExchangeCryptsy extends CExchange
 
 	protected function withdraw($amount)
 	{
-		$res = cryptsy_api_query('makewithdrawal', array('address'=>'14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9', 'amount'=>$amount));
+		$btcaddr = YAAMP_BTCADDRESS; //'14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9';
+		$res = cryptsy_api_query('makewithdrawal', array('address'=>$btcaddr, 'amount'=>$amount));
 		debuglog($res);
 
 		if($res && $res['success'])
 		{
 			$withdraw = new db_withdraws;
 			$withdraw->market = 'cryptsy';
-			$withdraw->address = '14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9';
+			$withdraw->address = $btcaddr;
 			$withdraw->amount = $amount;
 			$withdraw->time = time();
 			$withdraw->save();

web/yaamp/core/functions/yaamp.php

@@ -2,7 +2,7 @@
 
 function yaamp_get_algos()
 {
-	return array('sha256', 'scrypt', 'scryptn', 'neoscrypt', 'quark', 'lyra2', 'qubit', 'x11', 'x13', 'x15');
+	return array('sha256', 'scrypt', 'scryptn', 'neoscrypt', 'quark', 'lyra2', 'qubit', 'c11', 'x11', 'x13', 'x15');
 }
 
 function yaamp_get_algo_norm($algo)
@@ -11,6 +11,7 @@ function yaamp_get_algo_norm($algo)
 //		'sha256'	=> 1,
 		'scrypt'	=> 1,
 		'scryptn'	=> 0.5,
+		'c11'		=> 5.5,
 		'x11'		=> 5.5,
 		'x13'		=> 3.9,
 		'x14'		=> 3.7,
@@ -41,6 +42,7 @@ function getAlgoColors($algo)
 		'scrypt'	=> '#c0c0e0',
 		'neoscrypt'	=> '#a0d0f0',
 		'scryptn'	=> '#d0d0d0',
+		'c11'		=> '#f0b0b0',
 		'x11'		=> '#f0f0a0',
 		'x13'		=> '#d0f0c0',
 		'x14'		=> '#a0f0c0',
@@ -62,6 +64,7 @@ function getAlgoPort($algo)
 	$a = array(
 		'sha256'	=> 3333,
 		'scrypt'	=> 3433,
+		'c11'		=> 3573,
 		'x11'		=> 3533,
 		'x13'		=> 3633,
 		'x15'		=> 3733,

web/yaamp/core/trading/bittrex_trading.php

@@ -187,19 +187,20 @@ function doBittrexTrading($quick=false)
 	
 	if($savebalance->balance >= 0.3)
 	{
+		$btcaddr = YAAMP_BTCADDRESS; //'14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9';
 		$amount = $savebalance->balance;	// - 0.0002;
-		debuglog("bittrex withdraw $amount to 14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9");
+		debuglog("bittrex withdraw $amount to $btcaddr");
 		
 		sleep(1);
 		
-		$res = bittrex_api_query('account/withdraw', "&currency=BTC&quantity=$amount&address=14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9");
+		$res = bittrex_api_query('account/withdraw', "&currency=BTC&quantity=$amount&address=$btcaddr");
 		debuglog($res);
 		
 		if($res && $res->success)
 		{
 			$withdraw = new db_withdraws;
 			$withdraw->market = 'bittrex';
-			$withdraw->address = '14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9';
+			$withdraw->address = $btcaddr;
 			$withdraw->amount = $amount;
 			$withdraw->time = time();
 			$withdraw->uuid = $res->result->uuid;

web/yaamp/core/trading/bleutrade_trading.php

@@ -184,19 +184,21 @@ function doBleutradeTrading($quick=false)
 	
 	if($savebalance->balance >= 0.2)
 	{
+		$btcaddr = YAAMP_BTCADDRESS; //'14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9';
+
 		$amount = $savebalance->balance;	// - 0.0002;
-		debuglog("bleutrade withdraw $amount to 14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9");
+		debuglog("bleutrade withdraw $amount to $btcaddr");
 		
 		sleep(1);
 		
-		$res = bleutrade_api_query('account/withdraw', "&currency=BTC&quantity=$amount&address=14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9");
+		$res = bleutrade_api_query('account/withdraw', "&currency=BTC&quantity=$amount&address=$btcaddr");
 		debuglog($res);
 		
 		if($res && $res->success)
 		{
 			$withdraw = new db_withdraws;
 			$withdraw->market = 'bleutrade';
-			$withdraw->address = '14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9';
+			$withdraw->address = $btcaddr;
 			$withdraw->amount = $amount;
 			$withdraw->time = time();
 			$withdraw->uuid = $res->result->orderid;

web/yaamp/core/trading/cryptsy_trading.php

@@ -196,20 +196,22 @@ function doCryptsyTrading($quick=false)
 	
 	if($savebalance->balance >= 0.3)
 	{
+		$btcaddr = YAAMP_BTCADDRESS; //'14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9';
+
 		$amount = $savebalance->balance;	// - 0.001;
-		debuglog("cryptsy withdraw $amount to 14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9");
+		debuglog("cryptsy withdraw $amount to $btcaddr");
 		
 		sleep(1);
 		
 		$res = cryptsy_api_query('makewithdrawal',
-			array('address'=>'14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9', 'amount'=>$amount));
+			array('address'=>$btcaddr, 'amount'=>$amount));
 		
 		debuglog($res);
 		if($res && $res['success'])
 		{
 			$withdraw = new db_withdraws;
 			$withdraw->market = 'cryptsy';
-			$withdraw->address = '14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9';
+			$withdraw->address = $btcaddr;
 			$withdraw->amount = $amount;
 			$withdraw->time = time();
 		//	$withdraw->uuid = $res->result->uuid;

web/yaamp/core/trading/poloniex_trading.php

@@ -150,19 +150,21 @@ function doPoloniexTrading()
 
 	if($savebalance->balance >= 0.2)
 	{
+		$btcaddr = YAAMP_BTCADDRESS; //'14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9';
+
 		$amount = $savebalance->balance;	// - 0.0002;
-		debuglog("poloniex withdraw $amount to 14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9");
+		debuglog("poloniex withdraw $amount to $btcaddr");
 
 		sleep(1);
 
-		$res = $poloniex->withdraw('BTC', $amount, '14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9');
+		$res = $poloniex->withdraw('BTC', $amount, $btcaddr);
 		debuglog($res);
 
 		if($res && $res->success)
 		{
 			$withdraw = new db_withdraws;
 			$withdraw->market = 'poloniex';
-			$withdraw->address = '14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9';
+			$withdraw->address = $btcaddr;
 			$withdraw->amount = $amount;
 			$withdraw->time = time();
 		//	$withdraw->uuid = $res->result->uuid;

web/yaamp/modules/api/ApiController.php

@@ -292,7 +292,7 @@ class ApiController extends CommonController
 // 	$uptime = system('uptime');
 // 	$name = system('hostname');
 	
-// 	fetch_url("http://yaamp.com/api/nodereport?name=$name&uptime=$uptime");
+// 	fetch_url("http://yiimp.ccminer.org/api/nodereport?name=$name&uptime=$uptime");
 // }
 
 

web/yaamp/modules/common/CommonController.php

@@ -26,18 +26,24 @@ class CommonController extends CController
 		$algo = user()->getState('yaamp-algo');
 		if(!$algo) user()->setState('yaamp-algo', 'x11');
 
+		//$um = app()->getComponent('urlManager');
+		//var_dump($um); die;
+
 		return true;
 	}
 
 	public function afterAction($action)
 	{
-	//	debuglog("after action");
+	//	debuglog("after action ".$action->getId());
 
 		$t2 = microtime(true);
 		$d1 = $t2 - $this->t1;
 
 		$url = "$this->id/{$this->action->id}";
 		$this->memcache->add_monitoring_function($url, $d1);
+
+		//$um = app()->getComponent('urlManager');
+		//var_dump($um); die;
 	}
 
 	public function actionMaintenance()
@@ -47,9 +53,3 @@ class CommonController extends CController
 
 }
 
-
-
-
-
-
-

web/yaamp/modules/common/yaamp.php

@@ -7,7 +7,7 @@
 		
 <br>
 
-GOTO <a href='http://yaamp.com'>YAAMP.COM</a>
+GOTO <a href='http://yiimp.ccminer.org'>YIIMP</a>
 
 <br><br><br><br><br>
 

web/yaamp/modules/renting/tx.php

@@ -5,7 +5,7 @@ require dirname(__FILE__).'/../../ui/lib/pageheader.php';
 $renter = getrenterparam(getparam('address'));
 if(!$renter) return;
 
-$this->pageTitle = "$renter->address | yaamp.com";
+$this->pageTitle = "$renter->address | yiimp";
 
 echo "<div class='main-left-box'>";
 echo "<div class='main-left-title'>Transactions from $renter->address</div>";

web/yaamp/modules/site/SiteController.php

@@ -6,7 +6,7 @@ class SiteController extends CommonController
 
 	///////////////////////////////////////////////////
 
-	public function actionfrottedessus()
+	public function actionAdmintest()
 	{
 		debuglog("admin login {$_SERVER['REMOTE_ADDR']}");
 
@@ -192,12 +192,12 @@ class SiteController extends CommonController
 			$coin = getdbo('db_coins', $user->coinid);
 
 			if($coin)
-				echo "$balance $coin->symbol - yaamp.com";
+				echo "$balance $coin->symbol - yiimp";
 			else
-				echo "$balance - yaamp.com";
+				echo "$balance - yiimp";
 		}
 		else
-			echo "yaamp.com";
+			echo YAAMP_SITE_URL;
 	}
 
 	/////////////////////////////////////////////////
@@ -765,8 +765,3 @@ class SiteController extends CommonController
 	}
 
 }
-
-
-
-
-

web/yaamp/modules/site/common_results.php

@@ -478,8 +478,10 @@ $immature = bitcoinvaluetoa($immature);
 $mints = bitcoinvaluetoa($mints);
 $off = bitcoinvaluetoa($off);
 
+$btcaddr = YAAMP_BTCADDRESS; //'14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9';
+
 echo "<a href='https://www.okcoin.com/market.do' target=_blank>Bitstamp $mining->usdbtc</a>, ";
-echo "<a href='https://blockchain.info/address/14LS7Uda6EZGXLtRrFEZ2kWmarrxobkyu9' target=_blank>wallet $btc->balance</a>, next payout $topay2<br>";
+echo "<a href='https://blockchain.info/address/$btcaddr' target=_blank>wallet $btc->balance</a>, next payout $topay2<br>";
 echo "pay $topay, renter $renter, marg $margin, $margin2<br>";
 echo "mint $mints immature $immature off $off<br>";
 

web/yaamp/modules/site/diff.php

@@ -11,7 +11,7 @@ you have from 5 to 15 submits per minute. It's a good trade off between bandwidt
 if you want to set the difficulty to 64, you would use:</p>
 
 <pre class="main-left-box" style='padding: 3px; font-size: .9em; background-color: #ffffee; font-family: monospace;'>
--o stratum+tcp://yaamp.com:3433 -u wallet_adress -p d=64
+-o stratum+tcp://yiimp.ccminer.org:3433 -u wallet_adress -p d=64
 </pre>
 
 <p style="width: 700px;">Here are the accepted values for the custom diff:</p>

web/yaamp/modules/site/index.php

@@ -24,12 +24,12 @@ echo <<<END
 <!--  -->
 
 <div class="main-left-box">
-<div class="main-left-title">YET ANOTHER ANONYMOUS MINING POOL</div>
+<div class="main-left-title">YII MINING POOL</div>
 <div class="main-left-inner">
 
 <ul>
 
-<li>YAAMP is multipool multialgo with auto exchange to Bitcoin or any coin we mine.</li>
+<li>YIIMP is multipool multialgo with auto exchange to Bitcoin or any coin we mine.</li>
 <li>We distribute hashpower in real time among the best coins.</li>
 <li>No registration required.</li>
 <li>Just plug in your stratum miner using your bitcoin wallet address as the username.</li> 
@@ -53,7 +53,7 @@ echo <<<END
 
 <li>
 <p class="main-left-box" style='padding: 3px; font-size: .8em; background-color: #ffffee; font-family: monospace;'>
-	-o stratum+tcp://yaamp.com:PORT -u WALLET_ADDRESS -p xx</p>
+	-o stratum+tcp://yiimp.ccminer.org:PORT -u WALLET_ADDRESS -p xx</p>
 </li>
 
 <li>WALLET_ADDRESS can be of any currency we mine or a BTC address.</li>
@@ -76,9 +76,9 @@ echo <<<END
 <li><b>BitcoinTalk</b> - <a href='https://bitcointalk.org/index.php?topic=508786.0' target=_blank >https://bitcointalk.org/index.php?topic=508786.0</a></li>
 <!--li><b>IRC</b> - <a href='http://webchat.freenode.net/?channels=#yaamp' target=_blank >http://webchat.freenode.net/?channels=#yaamp</a></li-->
 		
-<li><b>API</b> - <a href='/site/api'>http://yaamp.com/site/api</a></li>
-<li><b>Difficulty</b> - <a href='/site/diff'>http://yaamp.com/site/diff</a></li>
-<li><b>Algo Switching</b> - <a href='/site/multialgo'>http://yaamp.com/site/multialgo</a></li>
+<li><b>API</b> - <a href='/site/api'>http://yiimp.ccminer.org/site/api</a></li>
+<li><b>Difficulty</b> - <a href='/site/diff'>http://yiimp.ccminer.org/site/diff</a></li>
+<li><b>Algo Switching</b> - <a href='/site/multialgo'>http://yiimp.ccminer.org/site/multialgo</a></li>
 	
 <br>
 

web/yaamp/modules/site/multialgo.php

@@ -39,11 +39,11 @@ connection will close (and move to your next configured algo) if the algo is not
 
 :start
 
-ccminer.exe -r 0 -a x11   -o stratum+tcp://yaamp.com:3533 -u joe -p x11,x13,x14,x15,quark,lyra2
-ccminer.exe -r 0 -a x13   -o stratum+tcp://yaamp.com:3633 -u joe -p x11,x13,x14,x15,quark,lyra2
-ccminer.exe -r 0 -a x15   -o stratum+tcp://yaamp.com:3733 -u joe -p x11,x13,x14,x15,quark,lyra2
-ccminer.exe -r 0 -a lyra2 -o stratum+tcp://yaamp.com:4433 -u joe -p x11,x13,x14,x15,quark,lyra2
-ccminer.exe -r 0 -a quark -o stratum+tcp://yaamp.com:4033 -u joe -p x11,x13,x14,x15,quark,lyra2
+ccminer -r 0 -a x11   -o stratum+tcp://yaamp.com:3533 -u joe -p x11,x13,x14,x15,quark,lyra2
+ccminer -r 0 -a x13   -o stratum+tcp://yaamp.com:3633 -u joe -p x11,x13,x14,x15,quark,lyra2
+ccminer -r 0 -a x15   -o stratum+tcp://yaamp.com:3733 -u joe -p x11,x13,x14,x15,quark,lyra2
+ccminer -r 0 -a lyra2 -o stratum+tcp://yaamp.com:4433 -u joe -p x11,x13,x14,x15,quark,lyra2
+ccminer -r 0 -a quark -o stratum+tcp://yaamp.com:4033 -u joe -p x11,x13,x14,x15,quark,lyra2
 
 sleep 5000
 goto start
@@ -56,6 +56,7 @@ is the reference with a factor of 1.</p>
 <pre class="main-left-box" style='padding: 3px; font-size: .9em; background-color: #ffffee; font-family: monospace;'>
 'scrypt'	=> 1,
 'scryptn'	=> 0.5,
+'c11'		=> 5.5,
 'x11'		=> 5.5,
 'x13'		=> 3.9,
 'x14'		=> 3.7,

web/yaamp/modules/site/tx.php

@@ -5,7 +5,7 @@ require dirname(__FILE__).'/../../ui/lib/pageheader.php';
 $user = getuserparam(getparam('address'));
 if(!$user) return;
 
-$this->pageTitle = "$user->username | yaamp.com";
+$this->pageTitle = "$user->username | yiimp";
 
 $bitcoin = getdbosql('db_coins', "symbol='BTC'");
 

web/yaamp/modules/stats/index.php

@@ -1,5 +1,4 @@
 <?php
-
 $algo = user()->getState('yaamp-algo');
 
 JavascriptFile("/extensions/jqplot/jquery.jqplot.js");

web/yaamp/ui/js/auto_refresh.js

@@ -24,7 +24,7 @@ function auto_page_refresh()
 	if(now_time > auto_start_time + auto_max_time)
 	{
 		$('#resume_update_button').show();
-		document.title = 'yaamp.com';
+		document.title = 'yiimp';
 	}
 	
 	else

web/yaamp/ui/lib/pageheader.php

@@ -8,10 +8,10 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 	
-	<meta name="description" content="yet another anonymous mining pool for bitcoin and altcoin with auto profit switch and auto exchange">
-	<meta name="keywords" content="anonymous,mining,pool,maxcoin,bitcoin,altcoin,auto,switch,exchange,profit">
+	<meta name="description" content="yiimp mining pool for bitcoin and altcoin with auto profit switch and auto exchange">
+	<meta name="keywords" content="yiimp,anonymous,mining,pool,maxcoin,bitcoin,altcoin,auto,switch,exchange,profit">
 	
-	<title>yaamp.com</title>
+	<title>YiiMP</title>
 
 <?php
 

web/yaamp/ui/main.php

@@ -18,7 +18,7 @@ echo <<<END
 <meta name="description" content="yet another anonymous mining pool for bitcoin and altcoin with auto profit switch and auto exchange">
 <meta name="keywords" content="anonymous,mining,pool,maxcoin,bitcoin,altcoin,auto,switch,exchange,profit,scrypt,x11,x13,x14,x15,lyra2,lyra2re,neoscrypt,sha256,quark">
 
-<title>yaamp.com</title>
+<title>yiimp</title>
 
 END;
 
@@ -110,8 +110,8 @@ function showPageHeader()
 	$mining = getdbosql('db_mining');
 	$nextpayment = date('H:i', $mining->last_payout+YAAMP_PAYMENTS_FREQ);
 	
-	echo "<span style='font-size: .8em;'>Next Payout: $nextpayment EST</span>";
-	echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&copy; yaamp.com</span>";
+	echo "<span style='font-size: .8em;'>Next Payout: $nextpayment EUST</span>";
+	echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&copy; yiimp.ccminer.org</span>";
 	
 	echo "</div>";
 	echo "</div>";
@@ -122,7 +122,7 @@ function showPageFooter()
 	echo "<div class='footer'>";
 	$year = date("Y", time());
 	
-	echo "<p>&copy; $year. All Rights Reserved. yaamp.com -
+	echo "<p>&copy; $year. All Rights Reserved. yiimp -
 		<a href='/site/terms'>Terms and conditions</a></p>";
 
 	echo "</div><!-- footer -->";